diff options
| author | Shivaram Venkataraman <shivaram@eecs.berkeley.edu> | 2014-02-13 14:26:06 -0800 |
|---|---|---|
| committer | Aaron Davidson <aaron@databricks.com> | 2014-02-13 14:26:06 -0800 |
| commit | 2414ed310ef6424894c37e8c2e8c461cbf880c78 (patch) | |
| tree | 05a091e8d1f2f9514dad350ddae800f577308b98 /ec2 | |
| parent | 5fa53c02fc89af7328a659045c954d72bf0b8664 (diff) | |
| download | spark-2414ed310ef6424894c37e8c2e8c461cbf880c78.tar.gz spark-2414ed310ef6424894c37e8c2e8c461cbf880c78.tar.bz2 spark-2414ed310ef6424894c37e8c2e8c461cbf880c78.zip | |
Merge pull request #598 from shivaram/master.
Update spark_ec2 to use 0.9.0 by default
Backports change from branch-0.9
Author: Shivaram Venkataraman <shivaram@eecs.berkeley.edu>
Closes #598 and squashes the following commits:
f6d3ed0 [Shivaram Venkataraman] Update spark_ec2 to use 0.9.0 by default Backports change from branch-0.9
Diffstat (limited to 'ec2')
| -rwxr-xr-x | ec2/spark_ec2.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index eea63fea2a..e88f80aa62 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -70,7 +70,7 @@ def parse_args(): "slaves across multiple (an additional $0.01/Gb for bandwidth" + "between zones applies)") parser.add_option("-a", "--ami", help="Amazon Machine Image ID to use") - parser.add_option("-v", "--spark-version", default="0.8.0", + parser.add_option("-v", "--spark-version", default="0.9.0", help="Version of Spark to use: 'X.Y.Z' or a specific git hash") parser.add_option("--spark-git-repo", default="https://github.com/apache/incubator-spark", @@ -157,7 +157,7 @@ def is_active(instance): # Return correct versions of Spark and Shark, given the supplied Spark version def get_spark_shark_version(opts): - spark_shark_map = {"0.7.3": "0.7.1", "0.8.0": "0.8.0"} + spark_shark_map = {"0.7.3": "0.7.1", "0.8.0": "0.8.0", "0.8.1": "0.8.1", "0.9.0": "0.9.0"} version = opts.spark_version.replace("v", "") if version not in spark_shark_map: print >> stderr, "Don't know about Spark version: %s" % version |