From ec0e904608eaa65bbbf35b2558a0116387abaecf Mon Sep 17 00:00:00 2001 From: Nicholas Chammas Date: Wed, 24 Dec 2014 15:10:02 -0500 Subject: [PATCH 1/2] [EC2] Update default Spark version to 1.2.0 --- ec2/spark_ec2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 556d99d1027b8..892e90c01be74 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -39,7 +39,7 @@ 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" From 3255832f050eb50976bd4f0c095467f1c69337fc Mon Sep 17 00:00:00 2001 From: Nicholas Chammas Date: Wed, 24 Dec 2014 17:28:35 -0500 Subject: [PATCH 2/2] add 1.2.0 version to Spark-Shark map --- ec2/spark_ec2.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 892e90c01be74..28d9b7b502530 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -255,6 +255,7 @@ def get_spark_shark_version(opts): "1.0.1": "1.0.1", "1.0.2": "1.0.2", "1.1.0": "1.1.0", + "1.2.0": "1.2.0", } version = opts.spark_version.replace("v", "") if version not in spark_shark_map: