Update versions for 1.1.1 release

apache · 01d233e4aede65ffa39b9d2322196d4b64186526 · Andrew Or committed Nov 11, 2014 · Nov 11, 2014 · 01d233e
1 parent be0cc99
commit 01d233e4aede65ffa39b9d2322196d4b64186526
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -1334,7 +1334,7 @@ class SparkContext(config: SparkConf) extends Logging {
  */
 object SparkContext extends Logging {
 
-  private[spark] val SPARK_VERSION = "1.1.0"
+  private[spark] val SPARK_VERSION = "1.1.1"
 
   private[spark] val SPARK_JOB_DESCRIPTION = "spark.job.description"
 
diff --git 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.1.0-SNAPSHOT
-SPARK_VERSION_SHORT: 1.1.0
+SPARK_VERSION: 1.1.1
+SPARK_VERSION_SHORT: 1.1.1
 SCALA_BINARY_VERSION: "2.10"
 SCALA_VERSION: "2.10.4"
 MESOS_VERSION: 0.18.1
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
@@ -84,7 +84,7 @@ def parse_args():
              "between zones applies)")
     parser.add_option("-a", "--ami", help="Amazon Machine Image ID to use")
     parser.add_option(
-        "-v", "--spark-version", default="1.1.0",
+        "-v", "--spark-version", default="1.1.1",
         help="Version of Spark to use: 'X.Y.Z' or a specific git hash")
     parser.add_option(
         "--spark-git-repo",
@@ -197,7 +197,7 @@ def is_active(instance):
 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", "1.0.1": "1.0.1", "1.0.2": "1.0.2", "1.1.0": "1.1.0"
+	"1.0.0": "1.0.0", "1.0.1": "1.0.1", "1.0.2": "1.0.2", "1.1.0": "1.1.0", "1.1.1": "1.1.1"
     }
     version = opts.spark_version.replace("v", "")
     if version not in spark_shark_map:
diff --git 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.1.0</version>
+    <version>1.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py
@@ -47,7 +47,7 @@
       ____              __
      / __/__  ___ _____/ /__
     _\ \/ _ \/ _ `/ __/  '_/
-   /__ / .__/\_,_/_/ /_/\_\   version 1.1.0
+   /__ / .__/\_,_/_/ /_/\_\   version 1.1.1
       /_/
 """)
 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
@@ -26,7 +26,7 @@ trait SparkILoopInit {
       ____              __
      / __/__  ___ _____/ /__
     _\ \/ _ \/ _ `/ __/  '_/
-   /___/ .__/\_,_/_/ /_/\_\   version 1.1.0
+   /___/ .__/\_,_/_/ /_/\_\   version 1.1.1
       /_/
 """)
     import Properties._
diff --git 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.1.0</version>
+    <version>1.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <properties>