Merge branch 'master' into scala-2.9
Conflicts: project/build.properties repl/src/main/scala/spark/repl/SparkInterpreterLoop.scala
This commit is contained in:
commit
cf8f5de61b
|
@ -3,6 +3,6 @@
|
||||||
project.organization=org.spark-project
|
project.organization=org.spark-project
|
||||||
project.name=spark
|
project.name=spark
|
||||||
sbt.version=0.7.7
|
sbt.version=0.7.7
|
||||||
project.version=0.3
|
project.version=0.4-SNAPSHOT
|
||||||
build.scala.versions=2.9.0-1
|
build.scala.versions=2.9.0-1
|
||||||
project.initialize=false
|
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._
|
import Properties._
|
||||||
|
|
Loading…
Reference in a new issue