Repository: incubator-zeppelin Updated Branches: refs/heads/master 74953380a -> 2ba4b38fb
upgrade spark to 1.5.1 simple & self-explanatory Author: tribbloid <[email protected]> Closes #333 from tribbloid/spark-1.5.1 and squashes the following commits: 10d9465 [tribbloid] add spark 1.5.1 into the version list b042fc5 [tribbloid] upgrade spark to 1.5.1 Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/2ba4b38f Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/2ba4b38f Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/2ba4b38f Branch: refs/heads/master Commit: 2ba4b38fb01dd3796888d5e6cbb40cb8fae90f79 Parents: 7495338 Author: tribbloid <[email protected]> Authored: Fri Oct 2 13:42:59 2015 -0400 Committer: Lee moon soo <[email protected]> Committed: Sat Oct 3 07:58:53 2015 +0200 ---------------------------------------------------------------------- spark-dependencies/pom.xml | 2 +- spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/2ba4b38f/spark-dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml index eac301f..90dabb9 100644 --- a/spark-dependencies/pom.xml +++ b/spark-dependencies/pom.xml @@ -458,7 +458,7 @@ <profile> <id>spark-1.5</id> <properties> - <spark.version>1.5.0</spark.version> + <spark.version>1.5.1</spark.version> <akka.group>com.typesafe.akka</akka.group> <akka.version>2.3.11</akka.version> <protobuf.version>2.5.0</protobuf.version> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/2ba4b38f/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java index 8fcdc1d..97716fa 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java @@ -31,7 +31,8 @@ public enum SparkVersion { SPARK_1_3_1, SPARK_1_4_0, SPARK_1_4_1, - SPARK_1_5_0; + SPARK_1_5_0, + SPARK_1_5_1; private int version;
