Repository: spark Updated Branches: refs/heads/branch-1.0 439cdc581 -> 3fbe3447e
Updating version for Spark 1.0.3 development. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3fbe3447 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3fbe3447 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3fbe3447 Branch: refs/heads/branch-1.0 Commit: 3fbe3447ec81b753985753dd47ad9941c78965e7 Parents: 439cdc5 Author: Tathagata Das <tathagata.das1...@gmail.com> Authored: Mon Aug 4 18:45:18 2014 -0700 Committer: Tathagata Das <tathagata.das1...@gmail.com> Committed: Mon Aug 4 18:45:18 2014 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/SparkContext.scala | 2 +- docs/_config.yml | 4 ++-- extras/java8-tests/pom.xml | 2 +- project/SparkBuild.scala | 2 +- project/project/SparkPluginBuild.scala | 2 +- python/epydoc.conf | 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, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/3fbe3447/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 113c691..4a7d33d 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -1265,7 +1265,7 @@ class SparkContext(config: SparkConf) extends Logging { */ object SparkContext extends Logging { - private[spark] val SPARK_VERSION = "1.0.2" + private[spark] val SPARK_VERSION = "1.0.3-SNAPSHOT" private[spark] val SPARK_JOB_DESCRIPTION = "spark.job.description" http://git-wip-us.apache.org/repos/asf/spark/blob/3fbe3447/docs/_config.yml ---------------------------------------------------------------------- diff --git a/docs/_config.yml b/docs/_config.yml index 491b935..05a04fd 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.2 -SPARK_VERSION_SHORT: 1.0.2 +SPARK_VERSION: 1.0.3 +SPARK_VERSION_SHORT: 1.0.3 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/3fbe3447/extras/java8-tests/pom.xml ---------------------------------------------------------------------- diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml index b4ad113..4944d3d 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.2-SNAPSHOT</version> + <version>1.0.3-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/spark/blob/3fbe3447/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 5b687e7..5328ad3 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.2" + val SPARK_VERSION = "1.0.3-SNAPSHOT" 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/3fbe3447/project/project/SparkPluginBuild.scala ---------------------------------------------------------------------- diff --git a/project/project/SparkPluginBuild.scala b/project/project/SparkPluginBuild.scala index 722d26f..707c9d0 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.2" + val sparkVersion = "1.0.3-SNAPSHOT" // 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/3fbe3447/python/epydoc.conf ---------------------------------------------------------------------- diff --git a/python/epydoc.conf b/python/epydoc.conf index 41c54de..8da73d4 100644 --- a/python/epydoc.conf +++ b/python/epydoc.conf @@ -18,7 +18,7 @@ # # Information about the project. -name: Spark 1.0.2 Python API Docs +name: Spark 1.0.3 Python API Docs url: http://spark.apache.org # The list of modules to document. Modules can be named using http://git-wip-us.apache.org/repos/asf/spark/blob/3fbe3447/python/pyspark/shell.py ---------------------------------------------------------------------- diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py index e6c3306..2deb685 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -46,7 +46,7 @@ print("""Welcome to ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ - /__ / .__/\_,_/_/ /_/\_\ version 1.0.2 + /__ / .__/\_,_/_/ /_/\_\ version 1.0.3-SNAPSHOT /_/ """) print("Using Python version %s (%s, %s)" % ( http://git-wip-us.apache.org/repos/asf/spark/blob/3fbe3447/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 9490195..c72ded2 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.2 + /___/ .__/\_,_/_/ /_/\_\ version 1.0.3-SNAPSHOT /_/ """) import Properties._ http://git-wip-us.apache.org/repos/asf/spark/blob/3fbe3447/yarn/alpha/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml index e67c451..0740d60 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.2</version> + <version>1.0.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
