Skip to content

Commit 01d233e

Browse files
author
Andrew Or
committed
Update versions for 1.1.1 release
1 parent be0cc99 commit 01d233e

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

core/src/main/scala/org/apache/spark/SparkContext.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,7 @@ class SparkContext(config: SparkConf) extends Logging {
13341334
*/
13351335
object SparkContext extends Logging {
13361336

1337-
private[spark] val SPARK_VERSION = "1.1.0"
1337+
private[spark] val SPARK_VERSION = "1.1.1"
13381338

13391339
private[spark] val SPARK_JOB_DESCRIPTION = "spark.job.description"
13401340

docs/_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ markdown: kramdown
33

44
# These allow the documentation to be updated with nerw releases
55
# of Spark, Scala, and Mesos.
6-
SPARK_VERSION: 1.1.0-SNAPSHOT
7-
SPARK_VERSION_SHORT: 1.1.0
6+
SPARK_VERSION: 1.1.1
7+
SPARK_VERSION_SHORT: 1.1.1
88
SCALA_BINARY_VERSION: "2.10"
99
SCALA_VERSION: "2.10.4"
1010
MESOS_VERSION: 0.18.1

ec2/spark_ec2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def parse_args():
8484
"between zones applies)")
8585
parser.add_option("-a", "--ami", help="Amazon Machine Image ID to use")
8686
parser.add_option(
87-
"-v", "--spark-version", default="1.1.0",
87+
"-v", "--spark-version", default="1.1.1",
8888
help="Version of Spark to use: 'X.Y.Z' or a specific git hash")
8989
parser.add_option(
9090
"--spark-git-repo",
@@ -197,7 +197,7 @@ def is_active(instance):
197197
def get_spark_shark_version(opts):
198198
spark_shark_map = {
199199
"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",
200-
"1.0.0": "1.0.0", "1.0.1": "1.0.1", "1.0.2": "1.0.2", "1.1.0": "1.1.0"
200+
"1.0.0": "1.0.0", "1.0.1": "1.0.1", "1.0.2": "1.0.2", "1.1.0": "1.1.0", "1.1.1": "1.1.1"
201201
}
202202
version = opts.spark_version.replace("v", "")
203203
if version not in spark_shark_map:

extras/java8-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent</artifactId>
23-
<version>1.1.0</version>
23+
<version>1.1.1</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

python/pyspark/shell.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
____ __
4848
/ __/__ ___ _____/ /__
4949
_\ \/ _ \/ _ `/ __/ '_/
50-
/__ / .__/\_,_/_/ /_/\_\ version 1.1.0
50+
/__ / .__/\_,_/_/ /_/\_\ version 1.1.1
5151
/_/
5252
""")
5353
print("Using Python version %s (%s, %s)" % (

repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ trait SparkILoopInit {
2626
____ __
2727
/ __/__ ___ _____/ /__
2828
_\ \/ _ \/ _ `/ __/ '_/
29-
/___/ .__/\_,_/_/ /_/\_\ version 1.1.0
29+
/___/ .__/\_,_/_/ /_/\_\ version 1.1.1
3030
/_/
3131
""")
3232
import Properties._

yarn/alpha/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>yarn-parent_2.10</artifactId>
23-
<version>1.1.0</version>
23+
<version>1.1.1</version>
2424
<relativePath>../pom.xml</relativePath>
2525
</parent>
2626
<properties>

0 commit comments

Comments
 (0)