ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into scala-2.9

Browse source 
Conflicts:
	project/build.properties
	repl/src/main/scala/spark/repl/SparkInterpreterLoop.scala
This commit is contained in:
Matei Zaharia 2011-07-14 17:48:56 -04:00
parent 7c77b2fa6a 02678724a4
commit cf8f5de61b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
project/build.properties
View file

@ -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

2
repl/src/main/scala/spark/repl/SparkILoop.scala
View file

@ -200,7 +200,7 @@ class SparkILoop(in0: Option[BufferedReader], val out: PrintWriter, val master:
____ __
/ __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/
/___/ .__/\_,_/_/ /_/\_\ version 0.3
/___/ .__/\_,_/_/ /_/\_\ version 0.4
/_/
""")
import Properties._