diff options
| author | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-09-10 13:43:13 -0700 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-09-10 13:43:13 -0700 |
| commit | 4204757714b36364611fb63bc008cf90fc53d8df (patch) | |
| tree | 875411b27de5072ad6c970e427017a5a7655ecd7 /ec2 | |
| parent | 3db72554be3f13478ccd5915e746491982163298 (diff) | |
| download | spark-4204757714b36364611fb63bc008cf90fc53d8df.tar.gz spark-4204757714b36364611fb63bc008cf90fc53d8df.tar.bz2 spark-4204757714b36364611fb63bc008cf90fc53d8df.zip | |
Add 1.5 to master branch EC2 scripts
This change brings it to par with `branch-1.5` (and 1.5.0 release)
Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
Closes #8704 from shivaram/ec2-1.5-update.
Diffstat (limited to 'ec2')
| -rwxr-xr-x | ec2/spark_ec2.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 11fd7ee0ec..3a2361c6d6 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.4.0" +SPARK_EC2_VERSION = "1.5.0" SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__)) VALID_SPARK_VERSIONS = set([ @@ -71,6 +71,8 @@ VALID_SPARK_VERSIONS = set([ "1.3.0", "1.3.1", "1.4.0", + "1.4.1", + "1.5.0" ]) SPARK_TACHYON_MAP = { @@ -84,6 +86,8 @@ SPARK_TACHYON_MAP = { "1.3.0": "0.5.0", "1.3.1": "0.5.0", "1.4.0": "0.6.4", + "1.4.1": "0.6.4", + "1.5.0": "0.7.1" } DEFAULT_SPARK_VERSION = SPARK_EC2_VERSION @@ -91,7 +95,7 @@ DEFAULT_SPARK_GITHUB_REPO = "https://github.com/apache/spark" # Default location to get the spark-ec2 scripts (and ami-list) from DEFAULT_SPARK_EC2_GITHUB_REPO = "https://github.com/amplab/spark-ec2" -DEFAULT_SPARK_EC2_BRANCH = "branch-1.4" +DEFAULT_SPARK_EC2_BRANCH = "branch-1.5" def setup_external_libs(libs): |