diff options
| author | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2014-09-24 11:34:39 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-09-24 11:34:39 -0700 |
| commit | 50f863365348d52a9285fc779efbedbf1567ea11 (patch) | |
| tree | ebcd647d893669d4b4154fd78829eb3c39f45ff1 /ec2 | |
| parent | c429126066f766396b706894b6942f1ca7fcb528 (diff) | |
| download | spark-50f863365348d52a9285fc779efbedbf1567ea11.tar.gz spark-50f863365348d52a9285fc779efbedbf1567ea11.tar.bz2 spark-50f863365348d52a9285fc779efbedbf1567ea11.zip | |
[SPARK-3659] Set EC2 version to 1.1.0 and update version map
This brings the master branch in sync with branch-1.1
Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
Closes #2510 from shivaram/spark-ec2-version and squashes the following commits:
bb0dd16 [Shivaram Venkataraman] Set EC2 version to 1.1.0 and update version map
Diffstat (limited to 'ec2')
| -rwxr-xr-x | ec2/spark_ec2.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index fbeccd89b4..7f2cd7d94d 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -38,7 +38,7 @@ import boto from boto.ec2.blockdevicemapping import BlockDeviceMapping, BlockDeviceType, EBSBlockDeviceType from boto import ec2 -DEFAULT_SPARK_VERSION = "1.0.0" +DEFAULT_SPARK_VERSION = "1.1.0" # A URL prefix from which to fetch AMI information AMI_PREFIX = "https://raw.github.com/mesos/spark-ec2/v2/ami-list" @@ -218,7 +218,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.0": "1.0.0", "1.0.1": "1.0.1", "1.0.2": "1.0.2", "1.1.0": "1.1.0" } version = opts.spark_version.replace("v", "") if version not in spark_shark_map: |