diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-07-14 17:48:56 -0400 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-07-14 17:48:56 -0400 |
| commit | cf8f5de61b74c05b53d6d6de12aaa580e9bba3c7 (patch) | |
| tree | dc3ae431fd98ddf3dd106ebbf0e6aa63dc9cd724 /repl/src | |
| parent | 7c77b2fa6a17bf5e382f03b0f6343ae7caed6925 (diff) | |
| parent | 02678724a42ee0fa4f83e29a8de3f4f38ca21cf2 (diff) | |
| download | spark-cf8f5de61b74c05b53d6d6de12aaa580e9bba3c7.tar.gz spark-cf8f5de61b74c05b53d6d6de12aaa580e9bba3c7.tar.bz2 spark-cf8f5de61b74c05b53d6d6de12aaa580e9bba3c7.zip | |
Merge branch 'master' into scala-2.9
Conflicts:
project/build.properties
repl/src/main/scala/spark/repl/SparkInterpreterLoop.scala
Diffstat (limited to 'repl/src')
| -rw-r--r-- | repl/src/main/scala/spark/repl/SparkILoop.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/repl/src/main/scala/spark/repl/SparkILoop.scala b/repl/src/main/scala/spark/repl/SparkILoop.scala index c0558f4ec4..490efa69bc 100644 --- a/repl/src/main/scala/spark/repl/SparkILoop.scala +++ b/repl/src/main/scala/spark/repl/SparkILoop.scala @@ -200,7 +200,7 @@ class SparkILoop(in0: Option[BufferedReader], val out: PrintWriter, val master: ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ - /___/ .__/\_,_/_/ /_/\_\ version 0.3 + /___/ .__/\_,_/_/ /_/\_\ version 0.4 /_/ """) import Properties._ |