From 48aa6775d6b54ccecdbe2287ae75d99c00b02d18 Mon Sep 17 00:00:00 2001 From: Patrick Wendell <pwendell@gmail.com> Date: Wed, 7 Dec 2016 22:29:55 -0800 Subject: [PATCH] Preparing development version 2.1.1-SNAPSHOT --- R/pkg/DESCRIPTION | 2 +- assembly/pom.xml | 2 +- common/network-common/pom.xml | 2 +- common/network-shuffle/pom.xml | 2 +- common/network-yarn/pom.xml | 2 +- common/sketch/pom.xml | 2 +- common/tags/pom.xml | 2 +- common/unsafe/pom.xml | 2 +- core/pom.xml | 2 +- docs/_config.yml | 4 ++-- examples/pom.xml | 2 +- external/docker-integration-tests/pom.xml | 2 +- external/flume-assembly/pom.xml | 2 +- external/flume-sink/pom.xml | 2 +- external/flume/pom.xml | 2 +- external/java8-tests/pom.xml | 2 +- external/kafka-0-10-assembly/pom.xml | 2 +- external/kafka-0-10-sql/pom.xml | 2 +- external/kafka-0-10/pom.xml | 2 +- external/kafka-0-8-assembly/pom.xml | 2 +- external/kafka-0-8/pom.xml | 2 +- external/kinesis-asl-assembly/pom.xml | 2 +- external/kinesis-asl/pom.xml | 2 +- external/spark-ganglia-lgpl/pom.xml | 2 +- graphx/pom.xml | 2 +- launcher/pom.xml | 2 +- mesos/pom.xml | 2 +- mllib-local/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 2 +- python/pyspark/version.py | 2 +- repl/pom.xml | 2 +- sql/catalyst/pom.xml | 2 +- sql/core/pom.xml | 2 +- sql/hive-thriftserver/pom.xml | 2 +- sql/hive/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- yarn/pom.xml | 2 +- 39 files changed, 40 insertions(+), 40 deletions(-) diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION index 981ae12464..46fb178112 100644 --- a/R/pkg/DESCRIPTION +++ b/R/pkg/DESCRIPTION @@ -1,7 +1,7 @@ Package: SparkR Type: Package Title: R Frontend for Apache Spark -Version: 2.1.0 +Version: 2.1.1 Date: 2016-11-06 Authors@R: c(person("Shivaram", "Venkataraman", role = c("aut", "cre"), email = "shivaram@cs.berkeley.edu"), diff --git a/assembly/pom.xml b/assembly/pom.xml index aebfd12227..29522fd3fd 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index 67d78d5f10..85644c4a37 100644 --- a/common/network-common/pom.xml +++ b/common/network-common/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index 93790979d7..e15ede974c 100644 --- a/common/network-shuffle/pom.xml +++ b/common/network-shuffle/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index 53cb8dd815..c93a355b84 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index 89bee8567f..7c9870a8cb 100644 --- a/common/sketch/pom.xml +++ b/common/sketch/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/common/tags/pom.xml b/common/tags/pom.xml index 7b45b23e9c..8f949b94fd 100644 --- a/common/tags/pom.xml +++ b/common/tags/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index 9b84f1e0c1..a9b858e271 100644 --- a/common/unsafe/pom.xml +++ b/common/unsafe/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/core/pom.xml b/core/pom.xml index bbe0700610..d24ef118a5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/docs/_config.yml b/docs/_config.yml index cd5849b374..84ad5500c0 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: 2.1.0 -SPARK_VERSION_SHORT: 2.1.0 +SPARK_VERSION: 2.1.1-SNAPSHOT +SPARK_VERSION_SHORT: 2.1.1 SCALA_BINARY_VERSION: "2.11" SCALA_VERSION: "2.11.7" MESOS_VERSION: 1.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 2fb42413ac..8a9e6cfcfc 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index 4061c5f089..3849c02ffb 100644 --- a/external/docker-integration-tests/pom.xml +++ b/external/docker-integration-tests/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/flume-assembly/pom.xml b/external/flume-assembly/pom.xml index 6cfc47ef00..964e45f31b 100644 --- a/external/flume-assembly/pom.xml +++ b/external/flume-assembly/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index 58caf35f65..eec7a889ca 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/flume/pom.xml b/external/flume/pom.xml index ed32fc0ec4..a7622d0815 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/java8-tests/pom.xml b/external/java8-tests/pom.xml index a3f3907573..e862126e48 100644 --- a/external/java8-tests/pom.xml +++ b/external/java8-tests/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/kafka-0-10-assembly/pom.xml b/external/kafka-0-10-assembly/pom.xml index 9ae4461db6..be8e73e41b 100644 --- a/external/kafka-0-10-assembly/pom.xml +++ b/external/kafka-0-10-assembly/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/kafka-0-10-sql/pom.xml b/external/kafka-0-10-sql/pom.xml index f7276d0bd2..fdfd2ccd43 100644 --- a/external/kafka-0-10-sql/pom.xml +++ b/external/kafka-0-10-sql/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml index 52c8815013..e5bf070124 100644 --- a/external/kafka-0-10/pom.xml +++ b/external/kafka-0-10/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/kafka-0-8-assembly/pom.xml b/external/kafka-0-8-assembly/pom.xml index 93b49bcf61..c0a94f5950 100644 --- a/external/kafka-0-8-assembly/pom.xml +++ b/external/kafka-0-8-assembly/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/kafka-0-8/pom.xml b/external/kafka-0-8/pom.xml index cdfd29e3a9..a02e23c691 100644 --- a/external/kafka-0-8/pom.xml +++ b/external/kafka-0-8/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index c6a79aa86b..d7bb1acdc1 100644 --- a/external/kinesis-asl-assembly/pom.xml +++ b/external/kinesis-asl-assembly/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index 3fa28aa81f..c53b72eefe 100644 --- a/external/kinesis-asl/pom.xml +++ b/external/kinesis-asl/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml index 5c82878060..41b16500dd 100644 --- a/external/spark-ganglia-lgpl/pom.xml +++ b/external/spark-ganglia-lgpl/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/graphx/pom.xml b/graphx/pom.xml index 1818bc80ea..96e34cacff 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/launcher/pom.xml b/launcher/pom.xml index d60a633b87..c0b70dfdc3 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/mesos/pom.xml b/mesos/pom.xml index f8e43d2c43..532d607334 100644 --- a/mesos/pom.xml +++ b/mesos/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index 6dcb44cebb..6c3a35eeb9 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/mllib/pom.xml b/mllib/pom.xml index 5cf3a7f3e0..757906d137 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/pom.xml b/pom.xml index 49f12703c0..555324524e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Spark Project Parent POM</name> <url>http://spark.apache.org/</url> diff --git a/python/pyspark/version.py b/python/pyspark/version.py index e91e778cb5..6ae3609ae7 100644 --- a/python/pyspark/version.py +++ b/python/pyspark/version.py @@ -16,4 +16,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "2.1.0" +__version__ = "2.1.1.dev0" diff --git a/repl/pom.xml b/repl/pom.xml index 1e7db9b10f..705316a944 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index c58e0f43b2..72be7e1005 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 37e7dccd2e..d7989c2413 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 468d758a77..34e0ae5bbc 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 7bf4fc0df4..c543a3e049 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/streaming/pom.xml b/streaming/pom.xml index 06569e6ee2..fba6a5d773 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/tools/pom.xml b/tools/pom.xml index 35d53b3019..0c4c9c9f51 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/yarn/pom.xml b/yarn/pom.xml index 38374b5ae5..85ec270bf9 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent_2.11</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> -- GitLab