Repository: spark Updated Branches: refs/heads/branch-0.9 60f4b3b2f -> c9a22e83d
[branch-0.9] bump versions for v0.9.2 release candidate Manually update some version numbers. Author: Xiangrui Meng <[email protected]> Closes #1458 from mengxr/v0.9.2-rc and squashes the following commits: 2c38419 [Xiangrui Meng] Merge remote-tracking branch 'apache/branch-0.9' into v0.9.2-rc 7d0fb76 [Xiangrui Meng] change tree/master to tree/branch-0.9 in docs ea2b205 [Xiangrui Meng] update version in SparkBuild 162af66 [Xiangrui Meng] Merge remote-tracking branch 'apache/branch-0.9' into v0.9.2-rc bc87035 [Xiangrui Meng] bump version numbers to 0.9.2 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c9a22e83 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c9a22e83 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c9a22e83 Branch: refs/heads/branch-0.9 Commit: c9a22e83d5df470abe4bc1135575c6683f7d645e Parents: 60f4b3b Author: Xiangrui Meng <[email protected]> Authored: Wed Jul 16 23:53:40 2014 -0700 Committer: Xiangrui Meng <[email protected]> Committed: Wed Jul 16 23:53:40 2014 -0700 ---------------------------------------------------------------------- docs/_config.yml | 4 ++-- ec2/spark_ec2.py | 5 +++-- project/SparkBuild.scala | 2 +- python/pyspark/shell.py | 2 +- repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala | 2 +- yarn/alpha/pom.xml | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/c9a22e83/docs/_config.yml ---------------------------------------------------------------------- diff --git a/docs/_config.yml b/docs/_config.yml index db6cf74..7645483 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.1 -SPARK_VERSION_SHORT: 0.9.1 +SPARK_VERSION: 0.9.2 +SPARK_VERSION_SHORT: 0.9.2 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/c9a22e83/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 6d06a5d..c522e68 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.1", + parser.add_option("-v", "--spark-version", default="0.9.2", 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/spark";, @@ -157,7 +157,8 @@ 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", "0.9.1": "0.9.1"} + 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", "0.9.2": "0.9.2"} 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/c9a22e83/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 6ce564e..b83a95f 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.2-SNAPSHOT", + version := "0.9.2", 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/c9a22e83/python/pyspark/shell.py ---------------------------------------------------------------------- diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py index 0425192..e04ef63 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -35,7 +35,7 @@ print """Welcome to ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ - /__ / .__/\_,_/_/ /_/\_\ version 0.9.1 + /__ / .__/\_,_/_/ /_/\_\ version 0.9.2 /_/ """ print "Using Python version %s (%s, %s)" % ( http://git-wip-us.apache.org/repos/asf/spark/blob/c9a22e83/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 557ed75..2a3fc21 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.1 + /___/ .__/\_,_/_/ /_/\_\ version 0.9.2 /_/ """) import Properties._ http://git-wip-us.apache.org/repos/asf/spark/blob/c9a22e83/yarn/alpha/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml index a03da5f..e1967c8 100644 --- a/yarn/alpha/pom.xml +++ b/yarn/alpha/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>yarn-parent_2.10</artifactId> - <version>0.9.1</version> + <version>0.9.2</version> <relativePath>../pom.xml</relativePath> </parent>
