You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/07/12 17:31:40 UTC
[2/2] git commit: Updating versions for branch-1.0
Updating versions for branch-1.0
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2a5514f7
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2a5514f7
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2a5514f7
Branch: refs/heads/branch-1.0
Commit: 2a5514f7dcb9765b60cb772b97038cbbd1b58983
Parents: ea434cf
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sat Jul 12 08:31:24 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sat Jul 12 08:31:24 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/2a5514f7/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 f0d6c81..113c691 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.1"
+ private[spark] val SPARK_VERSION = "1.0.2"
private[spark] val SPARK_JOB_DESCRIPTION = "spark.job.description"
http://git-wip-us.apache.org/repos/asf/spark/blob/2a5514f7/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index 8cc3edf..491b935 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.1
-SPARK_VERSION_SHORT: 1.0.1
+SPARK_VERSION: 1.0.2
+SPARK_VERSION_SHORT: 1.0.2
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/2a5514f7/extras/java8-tests/pom.xml
----------------------------------------------------------------------
diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml
index bbc13a5..b4ad113 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.1</version>
+ <version>1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/spark/blob/2a5514f7/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index ee4c3e1..e8edbf0 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"
+ val SPARK_VERSION = "1.0.2-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/2a5514f7/project/project/SparkPluginBuild.scala
----------------------------------------------------------------------
diff --git a/project/project/SparkPluginBuild.scala b/project/project/SparkPluginBuild.scala
index 96e1f69..aca93e3 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.1"
+ val sparkVersion = "1.0.2-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/2a5514f7/python/epydoc.conf
----------------------------------------------------------------------
diff --git a/python/epydoc.conf b/python/epydoc.conf
index c7e196c..41c54de 100644
--- a/python/epydoc.conf
+++ b/python/epydoc.conf
@@ -18,7 +18,7 @@
#
# Information about the project.
-name: Spark 1.0.1 Python API Docs
+name: Spark 1.0.2 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/2a5514f7/python/pyspark/shell.py
----------------------------------------------------------------------
diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py
index 039d791..5fa8178 100644
--- a/python/pyspark/shell.py
+++ b/python/pyspark/shell.py
@@ -46,7 +46,7 @@ print("""Welcome to
____ __
/ __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/
- /__ / .__/\_,_/_/ /_/\_\ version 1.0.1
+ /__ / .__/\_,_/_/ /_/\_\ version 1.0.2-SNAPSHOT
/_/
""")
print("Using Python version %s (%s, %s)" % (
http://git-wip-us.apache.org/repos/asf/spark/blob/2a5514f7/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 31b99db..d7c05c5 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.1
+ /___/ .__/\_,_/_/ /_/\_\ version 1.0.2-SNAPSHOT
/_/
""")
import Properties._
http://git-wip-us.apache.org/repos/asf/spark/blob/2a5514f7/yarn/alpha/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml
index 14c2327..88ae66b 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.1</version>
+ <version>1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>