aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2012-06-15 23:47:11 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2012-06-15 23:47:11 -0700
commitf58da6164eaf13dd986a39a40535975096b71b44 (patch)
tree78ccc05ff8b49bd8ec903d0481ecfebaa28ed574 /project
parentb5cf47cda382601e3f1400884415c9a6bd508a13 (diff)
parent4449eb97834ed6191dc0937d255c475191895980 (diff)
downloadspark-f58da6164eaf13dd986a39a40535975096b71b44.tar.gz
spark-f58da6164eaf13dd986a39a40535975096b71b44.tar.bz2
spark-f58da6164eaf13dd986a39a40535975096b71b44.zip
Merge branch 'master' into dev
Diffstat (limited to 'project')
-rw-r--r--project/SparkBuild.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index a2faf7399c..3ce6a086c1 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -20,7 +20,7 @@ object SparkBuild extends Build {
def sharedSettings = Defaults.defaultSettings ++ Seq(
organization := "org.spark-project",
- version := "0.4-SNAPSHOT",
+ version := "0.5.1-SNAPSHOT",
scalaVersion := "2.9.1",
scalacOptions := Seq(/*"-deprecation",*/ "-unchecked", "-optimize"), // -deprecation is too noisy due to usage of old Hadoop API, enable it once that's no longer an issue
unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath },