Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2BFE211811 for ; Tue, 22 Apr 2014 00:01:20 +0000 (UTC) Received: (qmail 29704 invoked by uid 500); 22 Apr 2014 00:01:17 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 29606 invoked by uid 500); 22 Apr 2014 00:01:16 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@spark.apache.org Delivered-To: mailing list commits@spark.apache.org Received: (qmail 29484 invoked by uid 99); 22 Apr 2014 00:01:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Apr 2014 00:01:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 706F38390C2; Tue, 22 Apr 2014 00:01:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pwendell@apache.org To: commits@spark.apache.org Date: Tue, 22 Apr 2014 00:01:14 -0000 Message-Id: <35b7c2bce8514b9096566543beb8ded6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Updating versions for Spark 1.0 Updating versions for Spark 1.0 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a34e6fda Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a34e6fda Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a34e6fda Branch: refs/heads/branch-1.0 Commit: a34e6fda1d6fb8e769c21db70845f1a6dde968d8 Parents: d778f66 Author: Patrick Wendell Authored: Mon Apr 21 16:59:38 2014 -0700 Committer: Patrick Wendell Committed: Mon Apr 21 16:59:38 2014 -0700 ---------------------------------------------------------------------- docs/_config.yml | 2 +- ec2/spark_ec2.py | 5 +++-- project/SparkBuild.scala | 2 +- project/project/SparkPluginBuild.scala | 2 +- python/pyspark/shell.py | 2 +- repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala | 2 +- yarn/alpha/pom.xml | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a34e6fda/docs/_config.yml ---------------------------------------------------------------------- diff --git a/docs/_config.yml b/docs/_config.yml index d585b8c..869dd57 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -3,7 +3,7 @@ markdown: kramdown # These allow the documentation to be updated with nerw releases # of Spark, Scala, and Mesos. -SPARK_VERSION: 1.0.0-SNAPSHOT +SPARK_VERSION: 1.0.0 SPARK_VERSION_SHORT: 1.0.0 SCALA_BINARY_VERSION: "2.10" SCALA_VERSION: "2.10.4" http://git-wip-us.apache.org/repos/asf/spark/blob/a34e6fda/ec2/spark_ec2.py ---------------------------------------------------------------------- diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 31209a6..9a53dce 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -70,7 +70,7 @@ def parse_args(): "slaves across multiple (an additional $0.01/Gb for bandwidth" + "between zones applies)") parser.add_option("-a", "--ami", help="Amazon Machine Image ID to use") - parser.add_option("-v", "--spark-version", default="0.9.1", + parser.add_option("-v", "--spark-version", default="1.0.0", help="Version of Spark to use: 'X.Y.Z' or a specific git hash") parser.add_option("--spark-git-repo", default="https://github.com/apache/spark", @@ -157,7 +157,8 @@ def is_active(instance): # Return correct versions of Spark and Shark, given the supplied Spark version def get_spark_shark_version(opts): - spark_shark_map = {"0.7.3": "0.7.1", "0.8.0": "0.8.0", "0.8.1": "0.8.1", "0.9.0": "0.9.0", "0.9.1": "0.9.1"} + spark_shark_map = {"0.7.3": "0.7.1", "0.8.0": "0.8.0", "0.8.1": "0.8.1", "0.9.0": "0.9.0", + "0.9.1": "0.9.1", "1.0.0": "1.0.0"} version = opts.spark_version.replace("v", "") if version not in spark_shark_map: print >> stderr, "Don't know about Spark version: %s" % version http://git-wip-us.apache.org/repos/asf/spark/blob/a34e6fda/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 33f9d64..9ca6ccd 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -30,7 +30,7 @@ import scala.collection.JavaConversions._ // import com.jsuereth.pgp.sbtplugin.PgpKeys._ object SparkBuild extends Build { - val SPARK_VERSION = "1.0.0-SNAPSHOT" + val SPARK_VERSION = "1.0.0" // Hadoop version to build against. For example, "1.0.4" for Apache releases, or // "2.0.0-mr1-cdh4.2.0" for Cloudera Hadoop. Note that these variables can be set http://git-wip-us.apache.org/repos/asf/spark/blob/a34e6fda/project/project/SparkPluginBuild.scala ---------------------------------------------------------------------- diff --git a/project/project/SparkPluginBuild.scala b/project/project/SparkPluginBuild.scala index 0142256..fb43ce7 100644 --- a/project/project/SparkPluginBuild.scala +++ b/project/project/SparkPluginBuild.scala @@ -26,7 +26,7 @@ import sbt.Keys._ object SparkPluginDef extends Build { lazy val root = Project("plugins", file(".")) dependsOn(sparkStyle) lazy val sparkStyle = Project("spark-style", file("spark-style"), settings = styleSettings) - val sparkVersion = "1.0.0-SNAPSHOT" + val sparkVersion = "1.0.0" // There is actually no need to publish this artifact. def styleSettings = Defaults.defaultSettings ++ Seq ( name := "spark-style", http://git-wip-us.apache.org/repos/asf/spark/blob/a34e6fda/python/pyspark/shell.py ---------------------------------------------------------------------- diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py index d172d58..52df22d 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -46,7 +46,7 @@ print("""Welcome to ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ - /__ / .__/\_,_/_/ /_/\_\ version 1.0.0-SNAPSHOT + /__ / .__/\_,_/_/ /_/\_\ version 1.0.0 /_/ """) print("Using Python version %s (%s, %s)" % ( http://git-wip-us.apache.org/repos/asf/spark/blob/a34e6fda/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala ---------------------------------------------------------------------- diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala b/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala index 910b31d..31b0fa7 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala @@ -26,7 +26,7 @@ trait SparkILoopInit { ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ - /___/ .__/\_,_/_/ /_/\_\ version 1.0.0-SNAPSHOT + /___/ .__/\_,_/_/ /_/\_\ version 1.0.0 /_/ """) import Properties._ http://git-wip-us.apache.org/repos/asf/spark/blob/a34e6fda/yarn/alpha/pom.xml ---------------------------------------------------------------------- diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml index d0aeace..c485963 100644 --- a/yarn/alpha/pom.xml +++ b/yarn/alpha/pom.xml @@ -20,7 +20,7 @@ org.apache.spark yarn-parent_2.10 - 1.0.0-SNAPSHOT + 1.0.0 ../pom.xml