diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-08 12:43:17 -0400 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-08 12:43:17 -0400 |
commit | 65caa8f711d8e8b7cf77255d0ca42163f07f426e (patch) | |
tree | 58f34f408fec722d531d46beeda263e7444cf8e2 /project | |
parent | 054feb6448578de5542f9ef54d4cc88f706c22f5 (diff) | |
parent | bc8ba222ff29d46cd2e3331753c9c4ce681eccb4 (diff) | |
download | spark-65caa8f711d8e8b7cf77255d0ca42163f07f426e.tar.gz spark-65caa8f711d8e8b7cf77255d0ca42163f07f426e.tar.bz2 spark-65caa8f711d8e8b7cf77255d0ca42163f07f426e.zip |
Merge remote-tracking branch 'jey/bump-development-version-to-0.8.0'
Conflicts:
docs/_config.yml
project/SparkBuild.scala
Diffstat (limited to 'project')
-rw-r--r-- | project/SparkBuild.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 08a6c1866e..f03efd6c83 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -35,7 +35,7 @@ object SparkBuild extends Build { def sharedSettings = Defaults.defaultSettings ++ Seq( organization := "org.spark-project", - version := "0.7.1-SNAPSHOT", + version := "0.8.0-SNAPSHOT", scalaVersion := "2.9.3", scalacOptions := Seq("-unchecked", "-optimize", "-deprecation"), unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath }, |