diff options
| author | Mark Smith <mark.smith@bronto.com> | 2015-06-12 08:19:03 -0700 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-06-12 08:19:03 -0700 |
| commit | 71cc17bfa7ff32f820742fdc2c45237b624c5370 (patch) | |
| tree | 6351f6ba040339221e40e91217900493fce7d672 /ec2 | |
| parent | c19c78577a211eefe1112ebd4670a4ce7c3cc3be (diff) | |
| download | spark-71cc17bfa7ff32f820742fdc2c45237b624c5370.tar.gz spark-71cc17bfa7ff32f820742fdc2c45237b624c5370.tar.bz2 spark-71cc17bfa7ff32f820742fdc2c45237b624c5370.zip | |
[SPARK-8322] [EC2] Added spark 1.4.0 into the VALID_SPARK_VERSIONS and…
… SPARK_TACHYON_MAP
This contribution is my original work and I license the work to the project under the project's open source license.
Author: Mark Smith <mark.smith@bronto.com>
Closes #6776 from markmsmith/SPARK-8322 and squashes the following commits:
d744244 [Mark Smith] [SPARK-8322][EC2] Fixed tachyon mapp entry to point to 0.6.4
e4f14d3 [Mark Smith] [SPARK-8322][EC2] Added spark 1.4.0 into the VALID_SPARK_VERSIONS and SPARK_TACHYON_MAP
Diffstat (limited to 'ec2')
| -rwxr-xr-x | ec2/spark_ec2.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 58b24ae9ef..5608749946 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -70,6 +70,7 @@ VALID_SPARK_VERSIONS = set([ "1.2.1", "1.3.0", "1.3.1", + "1.4.0", ]) SPARK_TACHYON_MAP = { @@ -82,6 +83,7 @@ SPARK_TACHYON_MAP = { "1.2.1": "0.5.0", "1.3.0": "0.5.0", "1.3.1": "0.5.0", + "1.4.0": "0.6.4", } DEFAULT_SPARK_VERSION = SPARK_EC2_VERSION |