diff options
author | Reynold Xin <rxin@apache.org> | 2013-10-05 17:24:35 -0700 |
---|---|---|
committer | Reynold Xin <rxin@apache.org> | 2013-10-05 17:24:35 -0700 |
commit | 8fc68d04bdea2a9bb895cb149b1b8e77d2ce0c19 (patch) | |
tree | 82f4da0c42d801b7b9978da5a474b72cc64e70d9 | |
parent | 100222b048a4957eeb4642d0cd3c54b2b468b0b4 (diff) | |
parent | 2484b846788ca2ef5f0cebd625154a0333d50797 (diff) | |
download | spark-8fc68d04bdea2a9bb895cb149b1b8e77d2ce0c19.tar.gz spark-8fc68d04bdea2a9bb895cb149b1b8e77d2ce0c19.tar.bz2 spark-8fc68d04bdea2a9bb895cb149b1b8e77d2ce0c19.zip |
Merge pull request #36 from pwendell/versions
Bumping EC2 default version in master to .
This change was already made on . This PR ports the change up to master.
-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 |