From 080717497365b83bc202ab16812ced93eb1ea7bd Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Wed, 7 Dec 2016 22:29:49 -0800 Subject: [PATCH] Preparing Spark release v2.1.0-rc2 --- 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 46fb178112802..981ae1246476b 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.1 +Version: 2.1.0 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 29522fd3fd829..aebfd12227751 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../pom.xml diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index 85644c4a37bbe..67d78d5f102fb 100644 --- a/common/network-common/pom.xml +++ b/common/network-common/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index e15ede974cf8c..93790979d7b26 100644 --- a/common/network-shuffle/pom.xml +++ b/common/network-shuffle/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index c93a355b84d0b..53cb8dd815d81 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index 7c9870a8cb85e..89bee8567fc74 100644 --- a/common/sketch/pom.xml +++ b/common/sketch/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/common/tags/pom.xml b/common/tags/pom.xml index 8f949b94fd233..7b45b23e9c546 100644 --- a/common/tags/pom.xml +++ b/common/tags/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index a9b858e27150f..9b84f1e0c1dfc 100644 --- a/common/unsafe/pom.xml +++ b/common/unsafe/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/core/pom.xml b/core/pom.xml index d24ef118a5c1e..bbe07006109ea 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../pom.xml diff --git a/docs/_config.yml b/docs/_config.yml index 84ad5500c0a7d..cd5849b37453c 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.1-SNAPSHOT -SPARK_VERSION_SHORT: 2.1.1 +SPARK_VERSION: 2.1.0 +SPARK_VERSION_SHORT: 2.1.0 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 8a9e6cfcfcc70..2fb42413aca81 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../pom.xml diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index 3849c02ffb03c..4061c5f089c54 100644 --- a/external/docker-integration-tests/pom.xml +++ b/external/docker-integration-tests/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/external/flume-assembly/pom.xml b/external/flume-assembly/pom.xml index 964e45f31b741..6cfc47ef00e2a 100644 --- a/external/flume-assembly/pom.xml +++ b/external/flume-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index eec7a889ca1ff..58caf35f65a16 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/external/flume/pom.xml b/external/flume/pom.xml index a7622d08151fe..ed32fc0ec4c18 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/external/java8-tests/pom.xml b/external/java8-tests/pom.xml index e862126e48dbe..a3f3907573f21 100644 --- a/external/java8-tests/pom.xml +++ b/external/java8-tests/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/external/kafka-0-10-assembly/pom.xml b/external/kafka-0-10-assembly/pom.xml index be8e73e41b947..9ae4461db64a2 100644 --- a/external/kafka-0-10-assembly/pom.xml +++ b/external/kafka-0-10-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/external/kafka-0-10-sql/pom.xml b/external/kafka-0-10-sql/pom.xml index fdfd2ccd4327a..f7276d0bd2197 100644 --- a/external/kafka-0-10-sql/pom.xml +++ b/external/kafka-0-10-sql/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml index e5bf070124b6a..52c88150137e3 100644 --- a/external/kafka-0-10/pom.xml +++ b/external/kafka-0-10/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/external/kafka-0-8-assembly/pom.xml b/external/kafka-0-8-assembly/pom.xml index c0a94f5950d5c..93b49bcf615b6 100644 --- a/external/kafka-0-8-assembly/pom.xml +++ b/external/kafka-0-8-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/external/kafka-0-8/pom.xml b/external/kafka-0-8/pom.xml index a02e23c69171d..cdfd29e3a9208 100644 --- a/external/kafka-0-8/pom.xml +++ b/external/kafka-0-8/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index d7bb1acdc1d81..c6a79aa86bcf0 100644 --- a/external/kinesis-asl-assembly/pom.xml +++ b/external/kinesis-asl-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index c53b72eefe84d..3fa28aa81f214 100644 --- a/external/kinesis-asl/pom.xml +++ b/external/kinesis-asl/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml index 41b16500dd2bc..5c828780600cd 100644 --- a/external/spark-ganglia-lgpl/pom.xml +++ b/external/spark-ganglia-lgpl/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/graphx/pom.xml b/graphx/pom.xml index 96e34cacff8b0..1818bc80ea78a 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../pom.xml diff --git a/launcher/pom.xml b/launcher/pom.xml index c0b70dfdc3364..d60a633b87699 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../pom.xml diff --git a/mesos/pom.xml b/mesos/pom.xml index 532d6073343ba..f8e43d2c43ec2 100644 --- a/mesos/pom.xml +++ b/mesos/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../pom.xml diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index 6c3a35eeb9ecd..6dcb44cebb254 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 757906d137c29..5cf3a7f3e0f5e 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 555324524ee82..49f12703c04df 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 pom Spark Project Parent POM http://spark.apache.org/ diff --git a/python/pyspark/version.py b/python/pyspark/version.py index 6ae3609ae7fae..e91e778cb518c 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.1.dev0" +__version__ = "2.1.0" diff --git a/repl/pom.xml b/repl/pom.xml index 705316a944e28..1e7db9b10f045 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../pom.xml diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 72be7e1005f64..c58e0f43b2ac7 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/sql/core/pom.xml b/sql/core/pom.xml index d7989c2413040..37e7dccd2e27d 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 34e0ae5bbc229..468d758a77884 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index c543a3e049531..7bf4fc0df45e8 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index fba6a5d7734a4..06569e6ee2231 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index 0c4c9c9f51828..35d53b30191a5 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../pom.xml diff --git a/yarn/pom.xml b/yarn/pom.xml index 85ec270bf9965..38374b5ae5a3b 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.1.1-SNAPSHOT + 2.1.0 ../pom.xml