Repository: spark Updated Branches: refs/heads/master 893d6fd70 -> 9c8076502
[EC2] Update default Spark version to 1.2.1 Author: Katsunori Kanda <pot...@gmail.com> Closes #4566 from potix2/ec2-update-version-1-2-1 and squashes the following commits: 77e7840 [Katsunori Kanda] [EC2] Update default Spark version to 1.2.1 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9c807650 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9c807650 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9c807650 Branch: refs/heads/master Commit: 9c8076502f0c2c6a6dcdc6720d16b34132dfc06a Parents: 893d6fd Author: Katsunori Kanda <pot...@gmail.com> Authored: Thu Feb 12 14:38:42 2015 -0800 Committer: Andrew Or <and...@databricks.com> Committed: Thu Feb 12 14:38:42 2015 -0800 ---------------------------------------------------------------------- ec2/spark_ec2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/9c807650/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 0ea7365..35209ae 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -42,7 +42,7 @@ from datetime import datetime from optparse import OptionParser from sys import stderr -SPARK_EC2_VERSION = "1.2.0" +SPARK_EC2_VERSION = "1.2.1" SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__)) VALID_SPARK_VERSIONS = set([ @@ -58,6 +58,7 @@ VALID_SPARK_VERSIONS = set([ "1.1.0", "1.1.1", "1.2.0", + "1.2.1", ]) DEFAULT_SPARK_VERSION = SPARK_EC2_VERSION --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org