diff options
| author | Nicholas Chammas <nicholas.chammas@gmail.com> | 2014-12-25 14:13:12 -0800 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2014-12-25 14:13:53 -0800 |
| commit | b6b6393b477baa7246e2c7c4942b30c14cb05fa4 (patch) | |
| tree | ffce6410021b9b2fd46d6921a861fe8a34acd6f8 /ec2 | |
| parent | 08b18c7eb790c65670778eab8a6e32486c5f76e9 (diff) | |
| download | spark-b6b6393b477baa7246e2c7c4942b30c14cb05fa4.tar.gz spark-b6b6393b477baa7246e2c7c4942b30c14cb05fa4.tar.bz2 spark-b6b6393b477baa7246e2c7c4942b30c14cb05fa4.zip | |
[EC2] Update default Spark version to 1.2.0
Now that 1.2.0 is out, let's update the default Spark version.
Author: Nicholas Chammas <nicholas.chammas@gmail.com>
Closes #3793 from nchammas/patch-1 and squashes the following commits:
3255832 [Nicholas Chammas] add 1.2.0 version to Spark-Shark map
ec0e904 [Nicholas Chammas] [EC2] Update default Spark version to 1.2.0
Diffstat (limited to 'ec2')
| -rwxr-xr-x | ec2/spark_ec2.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 556d99d102..c6679f7a0b 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -39,7 +39,7 @@ from datetime import datetime from optparse import OptionParser from sys import stderr -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" @@ -251,10 +251,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: |