diff options
| author | Aaron Davidson <aaron@databricks.com> | 2014-06-03 22:33:04 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-06-03 22:33:04 -0700 |
| commit | ab7c62d57300c4033292d06ba840dad02f5552d7 (patch) | |
| tree | 4fe1fa9de9042f0898d012364c910bf47380cabc /ec2/spark_ec2.py | |
| parent | 5284ca78d17fb4de9a7019f3bbecf86484c13763 (diff) | |
| download | spark-ab7c62d57300c4033292d06ba840dad02f5552d7.tar.gz spark-ab7c62d57300c4033292d06ba840dad02f5552d7.tar.bz2 spark-ab7c62d57300c4033292d06ba840dad02f5552d7.zip | |
Update spark-ec2 scripts for 1.0.0 on master
The change was previously committed only to branch-1.0 as part of https://github.com/apache/spark/commit/a34e6fda1d6fb8e769c21db70845f1a6dde968d8
Author: Aaron Davidson <aaron@databricks.com>
This patch had conflicts when merged, resolved by
Committer: Patrick Wendell <pwendell@gmail.com>
Closes #938 from aarondav/sparkec2 and squashes the following commits:
067cc31 [Aaron Davidson] Update spark-ec2 scripts for 1.0.0 on master
Diffstat (limited to 'ec2/spark_ec2.py')
| -rwxr-xr-x | ec2/spark_ec2.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 8b056f5ea7..3af9f66e17 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -83,7 +83,7 @@ def parse_args(): "between zones applies)") parser.add_option("-a", "--ami", help="Amazon Machine Image ID to use") parser.add_option( - "-v", "--spark-version", default="0.9.1", + "-v", "--spark-version", default="1.0.0", help="Version of Spark to use: 'X.Y.Z' or a specific git hash") parser.add_option( "--spark-git-repo", @@ -191,7 +191,8 @@ 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", "0.8.1": "0.8.1", "0.9.0": "0.9.0", "0.9.1": "0.9.1" + "0.7.3": "0.7.1", "0.8.0": "0.8.0", "0.8.1": "0.8.1", "0.9.0": "0.9.0", "0.9.1": "0.9.1", + "1.0.0": "1.0.0" } version = opts.spark_version.replace("v", "") if version not in spark_shark_map: @@ -199,7 +200,6 @@ def get_spark_shark_version(opts): sys.exit(1) return (version, spark_shark_map[version]) - # Attempt to resolve an appropriate AMI given the architecture and # region of the request. def get_spark_ami(opts): |