From 2a5514f7dcb9765b60cb772b97038cbbd1b58983 Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Sat, 12 Jul 2014 08:31:24 -0700
Subject: [PATCH] Updating versions for branch-1.0

---
 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(-)

diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
index f0d6c811f587..113c691815c7 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"
 
diff --git a/docs/_config.yml b/docs/_config.yml
index 8cc3edf32850..491b9351c2da 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
diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml
index bbc13a545c08..b4ad11328d17 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>
 
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index ee4c3e1a1087..e8edbf0af425 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
diff --git a/project/project/SparkPluginBuild.scala b/project/project/SparkPluginBuild.scala
index 96e1f693b797..aca93e326b3b 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",
diff --git a/python/epydoc.conf b/python/epydoc.conf
index c7e196cc2725..41c54de2843e 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
diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py
index 039d791dfd11..5fa817819951 100644
--- a/python/pyspark/shell.py
+++ b/python/pyspark/shell.py
@@ -46,7 +46,7 @@
       ____              __
      / __/__  ___ _____/ /__
     _\ \/ _ \/ _ `/ __/  '_/
-   /__ / .__/\_,_/_/ /_/\_\   version 1.0.1
+   /__ / .__/\_,_/_/ /_/\_\   version 1.0.2-SNAPSHOT
       /_/
 """)
 print("Using Python version %s (%s, %s)" % (
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 31b99dbb01f5..d7c05c5a68a6 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._
diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml
index 14c232753859..88ae66bc4c2b 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>