Skip to content
Snippets Groups Projects
Commit 50f86336 authored by Shivaram Venkataraman's avatar Shivaram Venkataraman Committed by Patrick Wendell
Browse files

[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
parent c4291260
No related branches found
No related tags found
No related merge requests found
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment