diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-10-01 11:57:24 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-10-01 11:57:24 +0530 |
| commit | 582969288592063ea4071080e8ff7b9108cf4a8b (patch) | |
| tree | 067a00d847b6a97b2ca840767808feaf40c19936 /project | |
| parent | 9865fd6aa07fd722c6782ec8001b732c39a98d45 (diff) | |
| parent | 714fdabd99bbff3a0cdec5dcf06b021a3a3f2da8 (diff) | |
| download | spark-582969288592063ea4071080e8ff7b9108cf4a8b.tar.gz spark-582969288592063ea4071080e8ff7b9108cf4a8b.tar.bz2 spark-582969288592063ea4071080e8ff7b9108cf4a8b.zip | |
Merge branch 'master' into scala-2.10
Conflicts:
core/src/main/scala/org/apache/spark/ui/jobs/JobProgressUI.scala
docs/_config.yml
project/SparkBuild.scala
repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index b5e65a1856..67d03f987f 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -79,9 +79,10 @@ object SparkBuild extends Build { def sharedSettings = Defaults.defaultSettings ++ Seq( organization := "org.apache.spark", - version := "0.8.0-SNAPSHOT", + version := "0.9.0-incubating-SNAPSHOT", scalaVersion := "2.10.2", - scalacOptions := Seq("-unchecked", "-optimize", "-deprecation", "-target:" + SCALAC_JVM_VERSION), + scalacOptions := Seq("-Xmax-classfile-name", "120", "-unchecked", "-deprecation", + "-target:" + SCALAC_JVM_VERSION), javacOptions := Seq("-target", JAVAC_JVM_VERSION, "-source", JAVAC_JVM_VERSION), unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath }, retrieveManaged := true, |