diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-11-26 00:16:20 -0500 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-11-26 00:16:20 -0500 |
| commit | dfb8c65b730fdf60540e91cd74fbaa2764a2a2bc (patch) | |
| tree | b59be58a76120f6454a4f9b711c0a345412decb7 | |
| parent | de8029b39142be5e91714a9d5240bcdb90f66886 (diff) | |
| download | spark-dfb8c65b730fdf60540e91cd74fbaa2764a2a2bc.tar.gz spark-dfb8c65b730fdf60540e91cd74fbaa2764a2a2bc.tar.bz2 spark-dfb8c65b730fdf60540e91cd74fbaa2764a2a2bc.zip | |
HOTFIX: Updating additional version data
| -rw-r--r-- | docs/_config.yml | 2 | ||||
| -rwxr-xr-x | ec2/spark_ec2.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/docs/_config.yml b/docs/_config.yml index cdea02fcff..5724be89d2 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -13,7 +13,7 @@ include: # These allow the documentation to be updated with newer releases # of Spark, Scala, and Mesos. -SPARK_VERSION: 1.2.0-SNAPSHOT +SPARK_VERSION: 1.2.0 SPARK_VERSION_SHORT: 1.2.0 SCALA_BINARY_VERSION: "2.10" SCALA_VERSION: "2.10.4" diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index a4ab844a56..226e986786 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.1.0" +DEFAULT_SPARK_VERSION = "1.2.0" SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__)) MESOS_SPARK_EC2_BRANCH = "v4" @@ -210,10 +210,13 @@ def get_spark_shark_version(opts): "0.8.1": "0.8.1", "0.9.0": "0.9.0", "0.9.1": "0.9.1", + # These are dummy versions (no Shark versions after this) "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", + "1.2.0": "1.2.0", } version = opts.spark_version.replace("v", "") if version not in spark_shark_map: |