diff options
| author | Patrick Wendell <patrick@databricks.com> | 2015-01-26 16:09:22 -0800 |
|---|---|---|
| committer | Patrick Wendell <patrick@databricks.com> | 2015-01-26 16:09:22 -0800 |
| commit | 07c0fd195eaddf57b3fcfffbde2a5817dff967bf (patch) | |
| tree | 86b29b45120dceb8a9e46f5dc5edce6bda07c546 | |
| parent | b378e9a747ab8b13f49b4fc2b6c1df6fa43cc2a2 (diff) | |
| download | spark-07c0fd195eaddf57b3fcfffbde2a5817dff967bf.tar.gz spark-07c0fd195eaddf57b3fcfffbde2a5817dff967bf.tar.bz2 spark-07c0fd195eaddf57b3fcfffbde2a5817dff967bf.zip | |
Updating versions for Spark 1.2.1
| -rw-r--r-- | core/src/main/scala/org/apache/spark/package.scala | 2 | ||||
| -rw-r--r-- | docs/_config.yml | 4 | ||||
| -rwxr-xr-x | ec2/spark_ec2.py | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/core/src/main/scala/org/apache/spark/package.scala b/core/src/main/scala/org/apache/spark/package.scala index 873ec3c8fa..9bb5f5ea37 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.0" + val SPARK_VERSION = "1.2.1" } diff --git a/docs/_config.yml b/docs/_config.yml index 5724be89d2..a6c176cde5 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -13,8 +13,8 @@ include: # These allow the documentation to be updated with newer releases # of Spark, Scala, and Mesos. -SPARK_VERSION: 1.2.0 -SPARK_VERSION_SHORT: 1.2.0 +SPARK_VERSION: 1.2.1 +SPARK_VERSION_SHORT: 1.2.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 index 815186e6eb..a137f8996f 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -39,7 +39,7 @@ import boto from boto.ec2.blockdevicemapping import BlockDeviceMapping, BlockDeviceType, EBSBlockDeviceType from boto import ec2 -DEFAULT_SPARK_VERSION = "1.2.0" +DEFAULT_SPARK_VERSION = "1.2.1" SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__)) MESOS_SPARK_EC2_BRANCH = "v4" @@ -217,6 +217,7 @@ def get_spark_shark_version(opts): "1.1.0": "1.1.0", "1.1.1": "1.1.1", "1.2.0": "1.2.0", + "1.2.1": "1.2.1", } version = opts.spark_version.replace("v", "") if version not in spark_shark_map: |