Repository: spark Updated Branches: refs/heads/master 5284ca78d -> ab7c62d57
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 <aa...@databricks.com> This patch had conflicts when merged, resolved by Committer: Patrick Wendell <pwend...@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 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ab7c62d5 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ab7c62d5 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ab7c62d5 Branch: refs/heads/master Commit: ab7c62d57300c4033292d06ba840dad02f5552d7 Parents: 5284ca7 Author: Aaron Davidson <aa...@databricks.com> Authored: Tue Jun 3 22:33:04 2014 -0700 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Tue Jun 3 22:33:04 2014 -0700 ---------------------------------------------------------------------- ec2/spark_ec2.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/ab7c62d5/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 8b056f5..3af9f66 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):
