You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2014/11/11 03:40:53 UTC
spark git commit: Update versions for 1.1.1 release
Repository: spark
Updated Branches:
refs/heads/branch-1.1 be0cc9952 -> 01d233e4a
Update versions for 1.1.1 release
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/01d233e4
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/01d233e4
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/01d233e4
Branch: refs/heads/branch-1.1
Commit: 01d233e4aede65ffa39b9d2322196d4b64186526
Parents: be0cc99
Author: Andrew Or <an...@databricks.com>
Authored: Mon Nov 10 18:40:34 2014 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Mon Nov 10 18:40:34 2014 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/SparkContext.scala | 2 +-
docs/_config.yml | 4 ++--
ec2/spark_ec2.py | 4 ++--
extras/java8-tests/pom.xml | 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, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/01d233e4/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 ee11547..cea5cf2 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.0"
+ private[spark] val SPARK_VERSION = "1.1.1"
private[spark] val SPARK_JOB_DESCRIPTION = "spark.job.description"
http://git-wip-us.apache.org/repos/asf/spark/blob/01d233e4/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index 84db618..d777f61 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.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
http://git-wip-us.apache.org/repos/asf/spark/blob/01d233e4/ec2/spark_ec2.py
----------------------------------------------------------------------
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index 2e36345..374d3a6 100755
--- 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:
http://git-wip-us.apache.org/repos/asf/spark/blob/01d233e4/extras/java8-tests/pom.xml
----------------------------------------------------------------------
diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml
index 8ce7b94..e1f0d7f 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.0</version>
+ <version>1.1.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/spark/blob/01d233e4/python/pyspark/shell.py
----------------------------------------------------------------------
diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py
index 8a9777a..0ee431c 100644
--- a/python/pyspark/shell.py
+++ b/python/pyspark/shell.py
@@ -47,7 +47,7 @@ print("""Welcome to
____ __
/ __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/
- /__ / .__/\_,_/_/ /_/\_\ version 1.1.0
+ /__ / .__/\_,_/_/ /_/\_\ version 1.1.1
/_/
""")
print("Using Python version %s (%s, %s)" % (
http://git-wip-us.apache.org/repos/asf/spark/blob/01d233e4/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 74c58eb..d834261 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.0
+ /___/ .__/\_,_/_/ /_/\_\ version 1.1.1
/_/
""")
import Properties._
http://git-wip-us.apache.org/repos/asf/spark/blob/01d233e4/yarn/alpha/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml
index 72d9b16..5337490 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.0</version>
+ <version>1.1.1</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