Repository: spark Updated Branches: refs/heads/master c19c78577 -> 71cc17bfa
[SPARK-8322] [EC2] Added spark 1.4.0 into the VALID_SPARK_VERSIONS and⦠⦠SPARK_TACHYON_MAP This contribution is my original work and I license the work to the project under the project's open source license. Author: Mark Smith <mark.sm...@bronto.com> Closes #6776 from markmsmith/SPARK-8322 and squashes the following commits: d744244 [Mark Smith] [SPARK-8322][EC2] Fixed tachyon mapp entry to point to 0.6.4 e4f14d3 [Mark Smith] [SPARK-8322][EC2] Added spark 1.4.0 into the VALID_SPARK_VERSIONS and SPARK_TACHYON_MAP Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/71cc17bf Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/71cc17bf Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/71cc17bf Branch: refs/heads/master Commit: 71cc17bfa7ff32f820742fdc2c45237b624c5370 Parents: c19c785 Author: Mark Smith <mark.sm...@bronto.com> Authored: Fri Jun 12 08:19:03 2015 -0700 Committer: Shivaram Venkataraman <shiva...@cs.berkeley.edu> Committed: Fri Jun 12 08:19:03 2015 -0700 ---------------------------------------------------------------------- ec2/spark_ec2.py | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/71cc17bf/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 58b24ae..5608749 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -70,6 +70,7 @@ VALID_SPARK_VERSIONS = set([ "1.2.1", "1.3.0", "1.3.1", + "1.4.0", ]) SPARK_TACHYON_MAP = { @@ -82,6 +83,7 @@ SPARK_TACHYON_MAP = { "1.2.1": "0.5.0", "1.3.0": "0.5.0", "1.3.1": "0.5.0", + "1.4.0": "0.6.4", } 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