Repository: spark Updated Branches: refs/heads/master 08b18c7eb -> b6b6393b4
[EC2] Update default Spark version to 1.2.0 Now that 1.2.0 is out, let's update the default Spark version. Author: Nicholas Chammas <[email protected]> Closes #3793 from nchammas/patch-1 and squashes the following commits: 3255832 [Nicholas Chammas] add 1.2.0 version to Spark-Shark map ec0e904 [Nicholas Chammas] [EC2] Update default Spark version to 1.2.0 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b6b6393b Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b6b6393b Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b6b6393b Branch: refs/heads/master Commit: b6b6393b477baa7246e2c7c4942b30c14cb05fa4 Parents: 08b18c7 Author: Nicholas Chammas <[email protected]> Authored: Thu Dec 25 14:13:12 2014 -0800 Committer: Josh Rosen <[email protected]> Committed: Thu Dec 25 14:13:53 2014 -0800 ---------------------------------------------------------------------- ec2/spark_ec2.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/b6b6393b/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 556d99d..c6679f7 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -39,7 +39,7 @@ from datetime import datetime from optparse import OptionParser from sys import stderr -DEFAULT_SPARK_VERSION = "1.1.0" +DEFAULT_SPARK_VERSION = "1.2.0" SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__)) MESOS_SPARK_EC2_BRANCH = "v4" @@ -251,10 +251,13 @@ def get_spark_shark_version(opts): "0.8.1": "0.8.1", "0.9.0": "0.9.0", "0.9.1": "0.9.1", + # These are dummy versions (no Shark versions after this) "1.0.0": "1.0.0", "1.0.1": "1.0.1", "1.0.2": "1.0.2", "1.1.0": "1.1.0", + "1.1.1": "1.1.1", + "1.2.0": "1.2.0", } version = opts.spark_version.replace("v", "") if version not in spark_shark_map: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
