Repository: spark Updated Branches: refs/heads/branch-1.4 8b25f62bf -> 141eab71e
[SPARK-8322] [EC2] Added spark 1.4.0 into the VALID_SPARK_VERSIONS and⦠⦠SPARK_TACHYON_MAP Author: Mark Smith <mark.sm...@bronto.com> Closes #6777 from markmsmith/branch-1.4 and squashes the following commits: a218cfa [Mark Smith] [SPARK-8322][EC2] Fixed tachyon mapp entry to point to 0.6.4 90d1655 [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/141eab71 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/141eab71 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/141eab71 Branch: refs/heads/branch-1.4 Commit: 141eab71ee3aa05da899ecfc6bae40b3798a4665 Parents: 8b25f62 Author: Mark Smith <mark.sm...@bronto.com> Authored: Fri Jun 12 10:28:30 2015 -0700 Committer: Shivaram Venkataraman <shiva...@cs.berkeley.edu> Committed: Fri Jun 12 10:28:30 2015 -0700 ---------------------------------------------------------------------- ec2/spark_ec2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/141eab71/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index a765c20..5aa3e3d 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -70,7 +70,7 @@ VALID_SPARK_VERSIONS = set([ "1.2.1", "1.3.0", "1.3.1", - "1.4.0" + "1.4.0", ]) SPARK_TACHYON_MAP = { @@ -83,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
