aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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