Permalink
Browse files

Merge branch 'master' into scala-2.9

Conflicts:
	project/build.properties
	repl/src/main/scala/spark/repl/SparkInterpreterLoop.scala
  • Loading branch information...
2 parents 7c77b2f + 0267872 commit cf8f5de61b74c05b53d6d6de12aaa580e9bba3c7 @mateiz mateiz committed Jul 14, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 project/build.properties
  2. +1 −1 repl/src/main/scala/spark/repl/SparkILoop.scala
@@ -3,6 +3,6 @@
project.organization=org.spark-project
project.name=spark
sbt.version=0.7.7
-project.version=0.3
+project.version=0.4-SNAPSHOT
build.scala.versions=2.9.0-1
project.initialize=false
@@ -200,7 +200,7 @@ class SparkILoop(in0: Option[BufferedReader], val out: PrintWriter, val master:
____ __
/ __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/
- /___/ .__/\_,_/_/ /_/\_\ version 0.3
+ /___/ .__/\_,_/_/ /_/\_\ version 0.4
/_/
""")
import Properties._

0 comments on commit cf8f5de

Please sign in to comment.