diff options
| author | Nick Pentreath <nick.pentreath@gmail.com> | 2013-10-07 11:46:17 +0200 |
|---|---|---|
| committer | Nick Pentreath <nick.pentreath@gmail.com> | 2013-10-07 11:46:17 +0200 |
| commit | a5e58b8f980fe49d02dce83e366f0ea0cf070d76 (patch) | |
| tree | 84928e9d6754330c2e685547a2363365f6f55c54 /ec2 | |
| parent | b0f5f4d441119662c09572de697b2d9943f703ef (diff) | |
| parent | d585613ee22ed9292a69e35cedb0d5965f4c906f (diff) | |
| download | spark-a5e58b8f980fe49d02dce83e366f0ea0cf070d76.tar.gz spark-a5e58b8f980fe49d02dce83e366f0ea0cf070d76.tar.bz2 spark-a5e58b8f980fe49d02dce83e366f0ea0cf070d76.zip | |
Merge branch 'master' into implicit-als
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 1190ed47f6..7da9355b5e 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.7.3", + parser.add_option("-v", "--spark-version", default="0.8.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/mesos/spark", @@ -155,7 +155,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.0"} + spark_shark_map = {"0.7.3": "0.7.0", "0.8.0": "0.8.0"} version = opts.spark_version.replace("v", "") if version not in spark_shark_map: print >> stderr, "Don't know about Spark version: %s" % version |