aboutsummaryrefslogtreecommitdiff
path: root/ec2
diff options
context:
space:
mode:
authorNicholas Chammas <nicholas.chammas@gmail.com>2015-12-03 11:59:10 -0800
committerShivaram Venkataraman <shivaram@cs.berkeley.edu>2015-12-03 11:59:10 -0800
commitad7cea6f776a39801d6bb5bb829d1800b175b2ab (patch)
tree05abcac8ad02f1ea2ae4976bcc5085e600fdbbcc /ec2
parentd576e76bbaa818480d31d2b8fbbe4b15718307d9 (diff)
downloadspark-ad7cea6f776a39801d6bb5bb829d1800b175b2ab.tar.gz
spark-ad7cea6f776a39801d6bb5bb829d1800b175b2ab.tar.bz2
spark-ad7cea6f776a39801d6bb5bb829d1800b175b2ab.zip
[SPARK-12107][EC2] Update spark-ec2 versions
I haven't created a JIRA. If we absolutely need one I'll do it, but I'm fine with not getting mentioned in the release notes if that's the only purpose it'll serve. cc marmbrus - We should include this in 1.6-RC2 if there is one. I can open a second PR against branch-1.6 if necessary. Author: Nicholas Chammas <nicholas.chammas@gmail.com> Closes #10109 from nchammas/spark-ec2-versions.
Diffstat (limited to 'ec2')
-rwxr-xr-xec2/spark_ec2.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py
index 84a950c9f6..19d5980560 100755
--- a/ec2/spark_ec2.py
+++ b/ec2/spark_ec2.py
@@ -51,7 +51,7 @@ else:
raw_input = input
xrange = range
-SPARK_EC2_VERSION = "1.5.0"
+SPARK_EC2_VERSION = "1.6.0"
SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__))
VALID_SPARK_VERSIONS = set([
@@ -72,7 +72,10 @@ VALID_SPARK_VERSIONS = set([
"1.3.1",
"1.4.0",
"1.4.1",
- "1.5.0"
+ "1.5.0",
+ "1.5.1",
+ "1.5.2",
+ "1.6.0",
])
SPARK_TACHYON_MAP = {
@@ -87,7 +90,10 @@ SPARK_TACHYON_MAP = {
"1.3.1": "0.5.0",
"1.4.0": "0.6.4",
"1.4.1": "0.6.4",
- "1.5.0": "0.7.1"
+ "1.5.0": "0.7.1",
+ "1.5.1": "0.7.1",
+ "1.5.2": "0.7.1",
+ "1.6.0": "0.8.2",
}
DEFAULT_SPARK_VERSION = SPARK_EC2_VERSION