spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andrewo...@apache.org
Subject spark git commit: Update versions to 1.1.2-SNAPSHOT
Date Mon, 24 Nov 2014 22:30:03 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.1 1df1c1d9b -> 63717375d


Update versions to 1.1.2-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/63717375
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/63717375
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/63717375

Branch: refs/heads/branch-1.1
Commit: 63717375d7e592a5a0ecf29662bfd285bf8e1115
Parents: 1df1c1d
Author: Andrew Or <andrew@databricks.com>
Authored: Mon Nov 24 14:29:40 2014 -0800
Committer: Andrew Or <andrew@databricks.com>
Committed: Mon Nov 24 14:29:40 2014 -0800

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/SparkContext.scala        | 2 +-
 docs/_config.yml                                               | 4 ++--
 extras/java8-tests/pom.xml                                     | 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 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/63717375/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 cea5cf2..e1e7e83 100644
--- 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.1"
+  private[spark] val SPARK_VERSION = "1.1.2-SNAPSHOT"
 
   private[spark] val SPARK_JOB_DESCRIPTION = "spark.job.description"
 

http://git-wip-us.apache.org/repos/asf/spark/blob/63717375/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index d777f61..33d6921 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.1.1
-SPARK_VERSION_SHORT: 1.1.1
+SPARK_VERSION: 1.1.2
+SPARK_VERSION_SHORT: 1.1.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/63717375/extras/java8-tests/pom.xml
----------------------------------------------------------------------
diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml
index e1f0d7f..061dddd 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.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/spark/blob/63717375/python/epydoc.conf
----------------------------------------------------------------------
diff --git a/python/epydoc.conf b/python/epydoc.conf
index d066ecb..2842338 100644
--- a/python/epydoc.conf
+++ b/python/epydoc.conf
@@ -18,7 +18,7 @@
 #
 
 # Information about the project.
-name: Spark 1.1.0 Python API Docs
+name: Spark 1.1.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/63717375/python/pyspark/shell.py
----------------------------------------------------------------------
diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py
index 0ee431c..99054a5 100644
--- a/python/pyspark/shell.py
+++ b/python/pyspark/shell.py
@@ -47,7 +47,7 @@ print("""Welcome to
       ____              __
      / __/__  ___ _____/ /__
     _\ \/ _ \/ _ `/ __/  '_/
-   /__ / .__/\_,_/_/ /_/\_\   version 1.1.1
+   /__ / .__/\_,_/_/ /_/\_\   version 1.1.2-SNAPSHOT
       /_/
 """)
 print("Using Python version %s (%s, %s)" % (

http://git-wip-us.apache.org/repos/asf/spark/blob/63717375/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 d834261..b6dfcd7 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.1.1
+   /___/ .__/\_,_/_/ /_/\_\   version 1.1.2-SNAPSHOT
       /_/
 """)
     import Properties._

http://git-wip-us.apache.org/repos/asf/spark/blob/63717375/yarn/alpha/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml
index 5337490..6a6f8a0 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.1.1</version>
+    <version>1.1.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <properties>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message