Skip to content
Snippets Groups Projects
Commit 65caa8f7 authored by Matei Zaharia's avatar Matei Zaharia
Browse files

Merge remote-tracking branch 'jey/bump-development-version-to-0.8.0' 

Conflicts:
	docs/_config.yml
	project/SparkBuild.scala
parents 054feb64 bc8ba222
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
bagel/pom.xml
+ 1
− 1
View file @ 65caa8f7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
core/pom.xml
+ 1
− 1
View file @ 65caa8f7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
docs/_config.yml
+ 2
− 2
View file @ 65caa8f7
...@@ -3,8 +3,8 @@ markdown: kramdown ...@@ -3,8 +3,8 @@ markdown: kramdown
# These allow the documentation to be updated with nerw releases # These allow the documentation to be updated with nerw releases
# of Spark, Scala, and Mesos. # of Spark, Scala, and Mesos.
SPARK_VERSION: 0.7.1-SNAPSHOT SPARK_VERSION: 0.8.0-SNAPSHOT
SPARK_VERSION_SHORT: 0.7.1 SPARK_VERSION_SHORT: 0.8.0
SCALA_VERSION: 2.9.3 SCALA_VERSION: 2.9.3
MESOS_VERSION: 0.9.0-incubating MESOS_VERSION: 0.9.0-incubating
SPARK_ISSUE_TRACKER_URL: https://spark-project.atlassian.net SPARK_ISSUE_TRACKER_URL: https://spark-project.atlassian.net
examples/pom.xml
+ 1
− 1
View file @ 65caa8f7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
pom.xml
+ 1
− 1
View file @ 65caa8f7
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.8.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Spark Project Parent POM</name> <name>Spark Project Parent POM</name>
<url>http://spark-project.org/</url> <url>http://spark-project.org/</url>
......
project/SparkBuild.scala
+ 1
− 1
View file @ 65caa8f7
...@@ -35,7 +35,7 @@ object SparkBuild extends Build { ...@@ -35,7 +35,7 @@ object SparkBuild extends Build {
def sharedSettings = Defaults.defaultSettings ++ Seq( def sharedSettings = Defaults.defaultSettings ++ Seq(
organization := "org.spark-project", organization := "org.spark-project",
version := "0.7.1-SNAPSHOT", version := "0.8.0-SNAPSHOT",
scalaVersion := "2.9.3", scalaVersion := "2.9.3",
scalacOptions := Seq("-unchecked", "-optimize", "-deprecation"), scalacOptions := Seq("-unchecked", "-optimize", "-deprecation"),
unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath }, unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath },
......
repl-bin/pom.xml
+ 1
− 1
View file @ 65caa8f7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
repl/pom.xml
+ 1
− 1
View file @ 65caa8f7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
repl/src/main/scala/spark/repl/SparkILoop.scala
+ 1
− 1
View file @ 65caa8f7
...@@ -200,7 +200,7 @@ class SparkILoop(in0: Option[BufferedReader], val out: PrintWriter, val master: ...@@ -200,7 +200,7 @@ class SparkILoop(in0: Option[BufferedReader], val out: PrintWriter, val master:
____ __ ____ __
/ __/__ ___ _____/ /__ / __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/ _\ \/ _ \/ _ `/ __/ '_/
/___/ .__/\_,_/_/ /_/\_\ version 0.7.1 /___/ .__/\_,_/_/ /_/\_\ version 0.8.0
/_/ /_/
""") """)
import Properties._ import Properties._
......
streaming/pom.xml
+ 1
− 1
View file @ 65caa8f7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
<artifactId>spark-parent</artifactId> <artifactId>spark-parent</artifactId>
<version>0.7.1-SNAPSHOT</version> <version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment