Repository: spark Updated Branches: refs/heads/branch-1.0 ddf9a7841 -> 43ba1ab64
Updating versions for 1.0.1 release Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/43ba1ab6 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/43ba1ab6 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/43ba1ab6 Branch: refs/heads/branch-1.0 Commit: 43ba1ab648412e11eb3626297de3219ef161c435 Parents: ddf9a78 Author: Patrick Wendell <[email protected]> Authored: Thu Jun 26 14:56:59 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Thu Jun 26 14:56:59 2014 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/SparkContext.scala | 2 +- docs/_config.yml | 4 ++-- ec2/spark_ec2.py | 4 ++-- extras/java8-tests/pom.xml | 2 +- project/SparkBuild.scala | 2 +- project/project/SparkPluginBuild.scala | 2 +- python/pyspark/shell.py | 2 +- repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala | 2 +- yarn/alpha/pom.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/43ba1ab6/core/src/main/scala/org/apache/spark/SparkContext.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index 815da4d..922a568 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -342,7 +342,7 @@ class SparkContext(config: SparkConf) extends Logging { localProperties.set(props) } - @deprecated("Properties no longer need to be explicitly initialized.", "1.0.0") + @deprecated("Properties no longer need to be explicitly initialized.", "1.0.1") def initLocalProperties() { localProperties.set(new Properties()) } http://git-wip-us.apache.org/repos/asf/spark/blob/43ba1ab6/docs/_config.yml ---------------------------------------------------------------------- diff --git a/docs/_config.yml b/docs/_config.yml index 9cb27ff..8cc3edf 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: 1.0.0 -SPARK_VERSION_SHORT: 1.0.0 +SPARK_VERSION: 1.0.1 +SPARK_VERSION_SHORT: 1.0.1 SCALA_BINARY_VERSION: "2.10" SCALA_VERSION: "2.10.4" MESOS_VERSION: 0.18.1 http://git-wip-us.apache.org/repos/asf/spark/blob/43ba1ab6/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 2ebe97f..9eb1657 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="1.0.0", + parser.add_option("-v", "--spark-version", default="1.0.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/spark";, @@ -164,7 +164,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", - "0.9.1": "0.9.1", "1.0.0": "1.0.0"} + "0.9.1": "0.9.1", "1.0.0": "1.0.0", "1.0.1", "1.0.0"} 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/43ba1ab6/extras/java8-tests/pom.xml ---------------------------------------------------------------------- diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml index 602f66f..bbc13a5 100644 --- a/extras/java8-tests/pom.xml +++ b/extras/java8-tests/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/spark/blob/43ba1ab6/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index d71771a..ee4c3e1 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -32,7 +32,7 @@ import scala.collection.JavaConversions._ // import com.jsuereth.pgp.sbtplugin.PgpKeys._ object SparkBuild extends Build { - val SPARK_VERSION = "1.0.1-SNAPSHOT" + val SPARK_VERSION = "1.0.1" val SPARK_VERSION_SHORT = SPARK_VERSION.replaceAll("-SNAPSHOT", "") // Hadoop version to build against. For example, "1.0.4" for Apache releases, or http://git-wip-us.apache.org/repos/asf/spark/blob/43ba1ab6/project/project/SparkPluginBuild.scala ---------------------------------------------------------------------- diff --git a/project/project/SparkPluginBuild.scala b/project/project/SparkPluginBuild.scala index fb43ce7..96e1f69 100644 --- a/project/project/SparkPluginBuild.scala +++ b/project/project/SparkPluginBuild.scala @@ -26,7 +26,7 @@ import sbt.Keys._ object SparkPluginDef extends Build { lazy val root = Project("plugins", file(".")) dependsOn(sparkStyle) lazy val sparkStyle = Project("spark-style", file("spark-style"), settings = styleSettings) - val sparkVersion = "1.0.0" + val sparkVersion = "1.0.1" // There is actually no need to publish this artifact. def styleSettings = Defaults.defaultSettings ++ Seq ( name := "spark-style", http://git-wip-us.apache.org/repos/asf/spark/blob/43ba1ab6/python/pyspark/shell.py ---------------------------------------------------------------------- diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py index 0a63cfc..039d791 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -46,7 +46,7 @@ print("""Welcome to ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ - /__ / .__/\_,_/_/ /_/\_\ version 1.0.0 + /__ / .__/\_,_/_/ /_/\_\ version 1.0.1 /_/ """) print("Using Python version %s (%s, %s)" % ( http://git-wip-us.apache.org/repos/asf/spark/blob/43ba1ab6/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 31b0fa7..31b99db 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala @@ -26,7 +26,7 @@ trait SparkILoopInit { ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ - /___/ .__/\_,_/_/ /_/\_\ version 1.0.0 + /___/ .__/\_,_/_/ /_/\_\ version 1.0.1 /_/ """) import Properties._ http://git-wip-us.apache.org/repos/asf/spark/blob/43ba1ab6/yarn/alpha/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml index d35a527..14c2327 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>1.0.0</version> + <version>1.0.1</version> <relativePath>../pom.xml</relativePath> </parent>
