Repository: spark Updated Branches: refs/heads/branch-1.2 b378e9a74 -> 07c0fd195
Updating versions for Spark 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/07c0fd19 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/07c0fd19 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/07c0fd19 Branch: refs/heads/branch-1.2 Commit: 07c0fd195eaddf57b3fcfffbde2a5817dff967bf Parents: b378e9a Author: Patrick Wendell <[email protected]> Authored: Mon Jan 26 16:09:22 2015 -0800 Committer: Patrick Wendell <[email protected]> Committed: Mon Jan 26 16:09:22 2015 -0800 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/package.scala | 2 +- docs/_config.yml | 4 ++-- ec2/spark_ec2.py | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/07c0fd19/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 873ec3c..9bb5f5e 100644 --- a/core/src/main/scala/org/apache/spark/package.scala +++ b/core/src/main/scala/org/apache/spark/package.scala @@ -44,5 +44,5 @@ package org.apache package object spark { // For package docs only - val SPARK_VERSION = "1.2.0" + val SPARK_VERSION = "1.2.1" } http://git-wip-us.apache.org/repos/asf/spark/blob/07c0fd19/docs/_config.yml ---------------------------------------------------------------------- diff --git a/docs/_config.yml b/docs/_config.yml index 5724be8..a6c176c 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -13,8 +13,8 @@ include: # These allow the documentation to be updated with newer releases # of Spark, Scala, and Mesos. -SPARK_VERSION: 1.2.0 -SPARK_VERSION_SHORT: 1.2.0 +SPARK_VERSION: 1.2.1 +SPARK_VERSION_SHORT: 1.2.1 SCALA_BINARY_VERSION: "2.10" SCALA_VERSION: "2.10.4" MESOS_VERSION: 0.18.1 http://git-wip-us.apache.org/repos/asf/spark/blob/07c0fd19/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 815186e..a137f89 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -39,7 +39,7 @@ import boto from boto.ec2.blockdevicemapping import BlockDeviceMapping, BlockDeviceType, EBSBlockDeviceType from boto import ec2 -DEFAULT_SPARK_VERSION = "1.2.0" +DEFAULT_SPARK_VERSION = "1.2.1" SPARK_EC2_DIR = os.path.dirname(os.path.realpath(__file__)) MESOS_SPARK_EC2_BRANCH = "v4" @@ -217,6 +217,7 @@ def get_spark_shark_version(opts): "1.1.0": "1.1.0", "1.1.1": "1.1.1", "1.2.0": "1.2.0", + "1.2.1": "1.2.1", } 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]
