aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Wendell <patrick@databricks.com>2015-04-05 08:17:49 -0400
committerPatrick Wendell <patrick@databricks.com>2015-04-05 08:17:49 -0400
commit86d1715cd44186a43b8676d48e995d82b215581e (patch)
tree587202b34da678b9162d6f842725154ab20ce1ed
parenteac952503a1c4b188c1839aca29fada92f605147 (diff)
downloadspark-86d1715cd44186a43b8676d48e995d82b215581e.tar.gz
spark-86d1715cd44186a43b8676d48e995d82b215581e.tar.bz2
spark-86d1715cd44186a43b8676d48e995d82b215581e.zip
[HOTFIX] Bumping versions for Spark 1.2.2
-rw-r--r--core/src/main/scala/org/apache/spark/package.scala2
-rw-r--r--docs/_config.yml4
-rwxr-xr-xec2/spark_ec2.py1
3 files changed, 4 insertions, 3 deletions
diff --git a/core/src/main/scala/org/apache/spark/package.scala b/core/src/main/scala/org/apache/spark/package.scala
index 9bb5f5ea37..b33214f5bd 100644
--- a/core/src/main/scala/org/apache/spark/package.scala
+++ b/core/src/main/scala/org/apache/spark/package.scala
@@ -44,5 +44,5 @@ package org.apache
package object spark {
// For package docs only
- val SPARK_VERSION = "1.2.1"
+ val SPARK_VERSION = "1.2.2"
}
diff --git a/docs/_config.yml b/docs/_config.yml
index 80d0efeec8..8ace356fef 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -14,8 +14,8 @@ include:
# These allow the documentation to be updated with newer releases
# of Spark, Scala, and Mesos.
-SPARK_VERSION: 1.2.1
-SPARK_VERSION_SHORT: 1.2.1
+SPARK_VERSION: 1.2.2
+SPARK_VERSION_SHORT: 1.2.2
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
index 43311c2eb6..4fea3d0def 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -218,6 +218,7 @@ def get_spark_shark_version(opts):
"1.1.1": "1.1.1",
"1.2.0": "1.2.0",
"1.2.1": "1.2.1",
+ "1.2.2": "1.2.2",
}
version = opts.spark_version.replace("v", "")
if version not in spark_shark_map: