Repository: spark Updated Branches: refs/heads/branch-0.9 c6630d363 -> 8a882eff9
Bumped versions to Spark 0.9.1 Self explanatory! Author: Tathagata Das <tathagata.das1...@gmail.com> Closes #190 from tdas/branch-0.9-version-bump and squashes the following commits: 34576ee [Tathagata Das] Bumped versions to Spark 0.9.1 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8a882eff Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8a882eff Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8a882eff Branch: refs/heads/branch-0.9 Commit: 8a882eff9d4a7377ba2f470a59a3ab4722c66d9d Parents: c6630d3 Author: Tathagata Das <tathagata.das1...@gmail.com> Authored: Thu Mar 20 16:55:35 2014 -0700 Committer: Tathagata Das <tathagata.das1...@gmail.com> Committed: Thu Mar 20 16:55:35 2014 -0700 ---------------------------------------------------------------------- docs/_config.yml | 4 ++-- ec2/spark_ec2.py | 4 ++-- pom.xml | 2 +- project/SparkBuild.scala | 2 +- python/pyspark/shell.py | 2 +- repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/8a882eff/docs/_config.yml ---------------------------------------------------------------------- diff --git a/docs/_config.yml b/docs/_config.yml index a7f46ff..db6cf74 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -3,8 +3,8 @@ markdown: kramdown # These allow the documentation to be updated with nerw releases # of Spark, Scala, and Mesos. -SPARK_VERSION: 0.9.0-incubating -SPARK_VERSION_SHORT: 0.9.0 +SPARK_VERSION: 0.9.1 +SPARK_VERSION_SHORT: 0.9.1 SCALA_BINARY_VERSION: "2.10" SCALA_VERSION: "2.10.3" MESOS_VERSION: 0.13.0 http://git-wip-us.apache.org/repos/asf/spark/blob/8a882eff/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index e88f80a..ca944ce 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -70,7 +70,7 @@ def parse_args(): "slaves across multiple (an additional $0.01/Gb for bandwidth" + "between zones applies)") parser.add_option("-a", "--ami", help="Amazon Machine Image ID to use") - parser.add_option("-v", "--spark-version", default="0.9.0", + parser.add_option("-v", "--spark-version", default="0.9.1", help="Version of Spark to use: 'X.Y.Z' or a specific git hash") parser.add_option("--spark-git-repo", default="https://github.com/apache/incubator-spark";, @@ -157,7 +157,7 @@ def is_active(instance): # Return correct versions of Spark and Shark, given the supplied Spark version def get_spark_shark_version(opts): - spark_shark_map = {"0.7.3": "0.7.1", "0.8.0": "0.8.0", "0.8.1": "0.8.1", "0.9.0": "0.9.0"} + spark_shark_map = {"0.7.3": "0.7.1", "0.8.0": "0.8.0", "0.8.1": "0.8.1", "0.9.0": "0.9.0", "0.9.1": "0.9.1"} version = opts.spark_version.replace("v", "") if version not in spark_shark_map: print >> stderr, "Don't know about Spark version: %s" % version http://git-wip-us.apache.org/repos/asf/spark/blob/8a882eff/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e53c930..f7ee914 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ </parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>0.9.1-incubating-SNAPSHOT</version> + <version>0.9.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Spark Project Parent POM</name> <url>http://spark.incubator.apache.org/</url> http://git-wip-us.apache.org/repos/asf/spark/blob/8a882eff/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index f9eeeb0..c5d6327 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -134,7 +134,7 @@ object SparkBuild extends Build { def sharedSettings = Defaults.defaultSettings ++ Seq( organization := "org.apache.spark", - version := "0.9.0-incubating", + version := "0.9.1", scalaVersion := "2.10.3", scalacOptions := Seq("-Xmax-classfile-name", "120", "-unchecked", "-deprecation", "-target:" + SCALAC_JVM_VERSION), http://git-wip-us.apache.org/repos/asf/spark/blob/8a882eff/python/pyspark/shell.py ---------------------------------------------------------------------- diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py index 9203342..0425192 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -35,7 +35,7 @@ print """Welcome to ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ - /__ / .__/\_,_/_/ /_/\_\ version 0.9.0 + /__ / .__/\_,_/_/ /_/\_\ version 0.9.1 /_/ """ print "Using Python version %s (%s, %s)" % ( http://git-wip-us.apache.org/repos/asf/spark/blob/8a882eff/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala ---------------------------------------------------------------------- diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala b/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala index ab5e283..557ed75 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala @@ -24,7 +24,7 @@ trait SparkILoopInit { ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ - /___/ .__/\_,_/_/ /_/\_\ version 0.9.0 + /___/ .__/\_,_/_/ /_/\_\ version 0.9.1 /_/ """) import Properties._
