diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION index 2d461ca68920b208a7c7c4cbe0199c0533630475..1ceda7ba024c058c83422141ce511c8374f3e8fc 100644 --- a/R/pkg/DESCRIPTION +++ b/R/pkg/DESCRIPTION @@ -1,6 +1,6 @@ Package: SparkR Type: Package -Version: 2.1.2 +Version: 2.1.1 Title: R Frontend for Apache Spark Description: The SparkR package provides an R Frontend for Apache Spark. Authors@R: c(person("Shivaram", "Venkataraman", role = c("aut", "cre"), diff --git a/assembly/pom.xml b/assembly/pom.xml index 6e092ef8928b6fdfab894121c9f6ec66116aa650..cc290c03c9dfa9046b92670631e7dcf5f4eb77dc 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index 77a4b64e8da9d82faa0147d3231e990970f2461a..ccf4b27b34a699b4fa37b381fae9bd8f79ce38b2 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index 1a2d85a2ead6b0f87a3504c59f5698ec1370286e..98a23249cc1920c211f8e1278e569c6641c4831d 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index 7a57e8964f6fc55f9511273e9995def8897dffe8..dc1ad144dee6f93c8a4792e7f0136511c2827531 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index ff2d5c52730bf6ce440bdf0d0f8e04a3c81f3b55..250b69699332e1ab30c0ad9b129ae724798f6d72 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/common/tags/pom.xml b/common/tags/pom.xml index b9bf0342eb6003c2e55a4f554177891094be47a4..0697ed625b261b0481b5d73c1b8c430d826fdee1 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index f8a0e577777ee9dc8f8a2b1020156a248c3f1921..cedae5fc279cce574f4996adc965e12b1b495055 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/core/pom.xml b/core/pom.xml index bad3655452fb41ff4f7328ddfe42a33d7dd301dc..28c4f95afe1980cd7322d1e9517f6474ce8dd742 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/docs/_config.yml b/docs/_config.yml index e21d011c4f83fe77e37e9ec508e41e116e3ee87a..75f48a59ab152ed154e99296f77184d8c60cddcc 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.2-SNAPSHOT -SPARK_VERSION_SHORT: 2.1.2 +SPARK_VERSION: 2.1.1 +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 8fa731fb340a2a5c62b5206775c96d9d68648e3c..72ee896f76238994bd7d2dd76363f3473b473506 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index 2cf0b41ee35446af9c36ea6c8435ae4f7e0276a1..ac407dd48beb0ab8161b449187afcb6b3c87fa59 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/flume-assembly/pom.xml b/external/flume-assembly/pom.xml index 6ea318bf4af6edca6672937475610363eb8990ec..92992e2f7081c1ac267ba165c78d419d20ab105a 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index de3d17e9b9c05066a796c0d543129a6f1a9a7c8c..7e0423a44b14137a7cb5992ad265dab6da0afccc 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 9361fdac11c5ba4120695e9ed7c8a06a7142d8ec..e1b86cec49c43ca9b875f2c9bf3ea9689af4f2bb 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/java8-tests/pom.xml b/external/java8-tests/pom.xml index f73e4f0aabc299fc9c4df273f41760efa720227c..8b0583a861e43acd8418658045f5e667df4da85b 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.2-SNAPSHOT</version> + <version>2.1.1</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 66a679661f1d3ac83d39de75c5f598441c62b9c0..1ca601e765a7527d3d39cab9d20a3a4d0a1772d3 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.2-SNAPSHOT</version> + <version>2.1.1</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 c84c0408f483a4ee88f1a2b88a7aa8d562e739c1..7ae63a5fa5654f6847e1695cde3de86b25931fe7 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml index 961b80df50c5a6a98787da4aa6a903c256c5d728..7a84764798244d02e50699737d497e1cbf88707c 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.2-SNAPSHOT</version> + <version>2.1.1</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 e56ed102ac89a18fa3c1a01bba5d1884c2854529..9bf41c5cfc2afc019311961e9e098a4ec4c299e4 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/kafka-0-8/pom.xml b/external/kafka-0-8/pom.xml index e260e434f8dd37e55e1b37f74411815a352e41fe..940112f641b06e87cd42afb72919a2be83864085 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index 72e14f58e38f982a3c41342c22fd29e8870db72b..e3305e91591b43fd8557b6b20e22bccd7df04cb4 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index 182f963cdd03c719094a4e91caf558195b5d38ec..7610fad9f29e0820e9a9571fb5b46d1f60d74f0b 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml index d6ba472a1fc99b54c37698ae7046bbc0388335ad..2fd4fd53d1aac165e5bd5e8d67ecf0957fb9d510 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/graphx/pom.xml b/graphx/pom.xml index 87e34b8a4b00ef0ac29aecd2a01bfd454b3a461b..ac6692194a79b0ab4aa5b4b7b8fadf6337151a7b 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/launcher/pom.xml b/launcher/pom.xml index db4b15b10499ea490536bd7f6365c849e723670b..3917251515d37cf14b4becfc4326b7f912c8920c 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/mesos/pom.xml b/mesos/pom.xml index 262316a193cacb60346bd1f7680a418ca02358f2..6d84d45f3be8f15c8573b8043bde1131c480fcce 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index dae5b86d5fcb850e8a470948c2198e73b47f1891..01a4b86121ebedffd7d7b1f57568440d7d8cec11 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/mllib/pom.xml b/mllib/pom.xml index be87ad2d1994b5a2977a4ed45ca06ff1e65585a6..44f189cb8c063f3a817ce9859a61f17e91347eac 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/pom.xml b/pom.xml index a66156c9050a26b04a163208cbb7967678a113b0..a985cf011de4b221fc32ac6e25bf538963d14d26 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.2-SNAPSHOT</version> + <version>2.1.1</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 4447e3d9c76166a43c0c194b8a1c8063965ef0b1..96b5e44bb320a21965fdf7782f9651269df2b4f3 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.2.dev0" +__version__ = "2.1.1" diff --git a/repl/pom.xml b/repl/pom.xml index 2cefaa191afdc2d00847d72ff02565b53160f8a1..12142c89db7f936dfa463bca5898ae325fb593cf 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 4b4a8eb3815e16f7733fa93704a38a289b87e29a..53d961d70038bf5f84f5f825ac37a4c59d902bbc 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/sql/core/pom.xml b/sql/core/pom.xml index a03a9593e8520691df804aebfe6a834f3159fcbe..c11710f4dfd6e3e833bb9cdf70069ad0c98885c9 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 1abc0a253098c5af222a9cb71f0f3c63579a7559..f7ea320c74ae7ba0b665a6ed5b4e47af18b0cc0a 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index b62f800277cee0c3589b08ede4c484b5217136e3..fb61f1495df01e39be784fdd973cd5a27e8d2608 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/streaming/pom.xml b/streaming/pom.xml index 644fc50bf507b80bcc0e7607cf4969385ca6d66a..ddad02f2bffedb19ef7ecb11e7143bbdfce997d5 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/tools/pom.xml b/tools/pom.xml index 11b58afdcac7a2f7b63b9fb4d05ec5ae911e0f93..193c0c5881715dcda998a68715577e6edb48632b 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/yarn/pom.xml b/yarn/pom.xml index e21df4ec1dc535603b24b6ca0f543f5c8171bdb4..1933a0ebccf5d81b43be31bb8818ebe9ab7d458c 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.2-SNAPSHOT</version> + <version>2.1.1</version> <relativePath>../pom.xml</relativePath> </parent>