Merge pull request #117 from markhamstra/csd-1.5

SKIPME Fix versions and mis-merge

Author: markhamstra

extras/java8-tests/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.10</artifactId>
-    <version>1.5.0-csd-1-SNAPSHOT</version>
+    <version>1.5.1-csd-10-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

extras/kinesis-asl-assembly/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.10</artifactId>
-    <version>1.5.0-csd-1-SNAPSHOT</version>
+    <version>1.5.1-csd-10-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

extras/kinesis-asl/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.10</artifactId>
-    <version>1.5.0-csd-1-SNAPSHOT</version>
+    <version>1.5.1-csd-10-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

extras/spark-ganglia-lgpl/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.10</artifactId>
-    <version>1.5.0-csd-1-SNAPSHOT</version>
+    <version>1.5.1-csd-10-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala

@@ -1756,14 +1756,4 @@ class SQLQuerySuite extends QueryTest with SharedSQLContext {
         df1.withColumn("diff", lit(0)))
     }
   }
-
-  test("SPARK-10389: order by non-attribute grouping expression on Aggregate") {
-    withTempTable("src") {
-      Seq((1, 1), (-1, 1)).toDF("key", "value").registerTempTable("src")
-      checkAnswer(sql("SELECT MAX(value) FROM src GROUP BY key + 1 ORDER BY key + 1"),
-        Seq(Row(1), Row(1)))
-      checkAnswer(sql("SELECT MAX(value) FROM src GROUP BY key + 1 ORDER BY (key + 1) * 2"),
-        Seq(Row(1), Row(1)))
-    }
-  }
 }