From 90d165528f03c9e34442bb1d5cadf22b28b38ae0 Mon Sep 17 00:00:00 2001 From: Mark Smith Date: Fri, 12 Jun 2015 01:05:43 -0400 Subject: [PATCH 1/2] [SPARK-8322][EC2] Added spark 1.4.0 into the VALID_SPARK_VERSIONS and SPARK_TACHYON_MAP --- ec2/spark_ec2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index a765c20d18bec..2a83d8358afc6 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -70,7 +70,7 @@ "1.2.1", "1.3.0", "1.3.1", - "1.4.0" + "1.4.0", ]) SPARK_TACHYON_MAP = { @@ -83,6 +83,7 @@ "1.2.1": "0.5.0", "1.3.0": "0.5.0", "1.3.1": "0.5.0", + "1.4.0": "0.5.0", } DEFAULT_SPARK_VERSION = SPARK_EC2_VERSION From a218cfa41419b1050a25dc6243d1d57673d9cfc0 Mon Sep 17 00:00:00 2001 From: Mark Smith Date: Fri, 12 Jun 2015 01:35:32 -0400 Subject: [PATCH 2/2] [SPARK-8322][EC2] Fixed tachyon mapp entry to point to 0.6.4 --- 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 2a83d8358afc6..5aa3e3d6903b3 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -83,7 +83,7 @@ "1.2.1": "0.5.0", "1.3.0": "0.5.0", "1.3.1": "0.5.0", - "1.4.0": "0.5.0", + "1.4.0": "0.6.4", } DEFAULT_SPARK_VERSION = SPARK_EC2_VERSION