Repository: spark Updated Branches: refs/heads/master 3db72554b -> 420475771
Add 1.5 to master branch EC2 scripts This change brings it to par with `branch-1.5` (and 1.5.0 release) Author: Shivaram Venkataraman <shiva...@cs.berkeley.edu> Closes #8704 from shivaram/ec2-1.5-update. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/42047577 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/42047577 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/42047577 Branch: refs/heads/master Commit: 4204757714b36364611fb63bc008cf90fc53d8df Parents: 3db7255 Author: Shivaram Venkataraman <shiva...@cs.berkeley.edu> Authored: Thu Sep 10 13:43:13 2015 -0700 Committer: Shivaram Venkataraman <shiva...@cs.berkeley.edu> Committed: Thu Sep 10 13:43:13 2015 -0700 ---------------------------------------------------------------------- ec2/spark_ec2.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/42047577/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 11fd7ee..3a2361c 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -51,7 +51,7 @@ else: raw_input = input xrange = range -SPARK_EC2_VERSION = "1.4.0" +SPARK_EC2_VERSION = "1.5.0" SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__)) VALID_SPARK_VERSIONS = set([ @@ -71,6 +71,8 @@ VALID_SPARK_VERSIONS = set([ "1.3.0", "1.3.1", "1.4.0", + "1.4.1", + "1.5.0" ]) SPARK_TACHYON_MAP = { @@ -84,6 +86,8 @@ SPARK_TACHYON_MAP = { "1.3.0": "0.5.0", "1.3.1": "0.5.0", "1.4.0": "0.6.4", + "1.4.1": "0.6.4", + "1.5.0": "0.7.1" } DEFAULT_SPARK_VERSION = SPARK_EC2_VERSION @@ -91,7 +95,7 @@ DEFAULT_SPARK_GITHUB_REPO = "https://github.com/apache/spark"; # Default location to get the spark-ec2 scripts (and ami-list) from DEFAULT_SPARK_EC2_GITHUB_REPO = "https://github.com/amplab/spark-ec2"; -DEFAULT_SPARK_EC2_BRANCH = "branch-1.4" +DEFAULT_SPARK_EC2_BRANCH = "branch-1.5" def setup_external_libs(libs): --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
