Repository: spark Updated Branches: refs/heads/branch-1.4 df9e39470 -> 8887abb06
Update branch-1.4 for 1.4.2 release. Author: Reynold Xin <r...@databricks.com> Closes #8891 from rxin/release-1.4.2. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8887abb0 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8887abb0 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8887abb0 Branch: refs/heads/branch-1.4 Commit: 8887abb06a01c8a264998457c5dfc8cf713675dd Parents: df9e394 Author: Reynold Xin <r...@databricks.com> Authored: Wed Sep 23 18:53:55 2015 -0700 Committer: Reynold Xin <r...@databricks.com> Committed: Wed Sep 23 18:53:55 2015 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/package.scala | 2 +- dev/create-release/generate-changelist.py | 4 ++-- docs/_config.yml | 4 ++-- ec2/spark_ec2.py | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/8887abb0/core/src/main/scala/org/apache/spark/package.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/package.scala b/core/src/main/scala/org/apache/spark/package.scala index 8f01174..c8d8e7c 100644 --- a/core/src/main/scala/org/apache/spark/package.scala +++ b/core/src/main/scala/org/apache/spark/package.scala @@ -43,5 +43,5 @@ package org.apache package object spark { // For package docs only - val SPARK_VERSION = "1.4.1" + val SPARK_VERSION = "1.4.2" } http://git-wip-us.apache.org/repos/asf/spark/blob/8887abb0/dev/create-release/generate-changelist.py ---------------------------------------------------------------------- diff --git a/dev/create-release/generate-changelist.py b/dev/create-release/generate-changelist.py index 148ed72..64b27cb 100755 --- a/dev/create-release/generate-changelist.py +++ b/dev/create-release/generate-changelist.py @@ -31,8 +31,8 @@ import time import traceback SPARK_HOME = os.environ["SPARK_HOME"] -NEW_RELEASE_VERSION = "1.4.1" -PREV_RELEASE_GIT_TAG = "v1.4.0" +NEW_RELEASE_VERSION = "1.4.2" +PREV_RELEASE_GIT_TAG = "v1.4.1" CHANGELIST = "CHANGES.txt" OLD_CHANGELIST = "%s.old" % (CHANGELIST) http://git-wip-us.apache.org/repos/asf/spark/blob/8887abb0/docs/_config.yml ---------------------------------------------------------------------- diff --git a/docs/_config.yml b/docs/_config.yml index 83f56e8..d1e0d0a 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -14,8 +14,8 @@ include: # These allow the documentation to be updated with newer releases # of Spark, Scala, and Mesos. -SPARK_VERSION: 1.4.1 -SPARK_VERSION_SHORT: 1.4.1 +SPARK_VERSION: 1.4.2 +SPARK_VERSION_SHORT: 1.4.2 SCALA_BINARY_VERSION: "2.10" SCALA_VERSION: "2.10.4" MESOS_VERSION: 0.21.0 http://git-wip-us.apache.org/repos/asf/spark/blob/8887abb0/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 3880c2d..b186287 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -72,6 +72,7 @@ VALID_SPARK_VERSIONS = set([ "1.3.1", "1.4.0", "1.4.1", + "1.4.2" ]) SPARK_TACHYON_MAP = { @@ -86,6 +87,7 @@ SPARK_TACHYON_MAP = { "1.3.1": "0.5.0", "1.4.0": "0.6.4", "1.4.1": "0.6.4", + "1.4.2": "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