diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-06-15 23:47:11 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-06-15 23:47:11 -0700 |
| commit | f58da6164eaf13dd986a39a40535975096b71b44 (patch) | |
| tree | 78ccc05ff8b49bd8ec903d0481ecfebaa28ed574 /repl/src | |
| parent | b5cf47cda382601e3f1400884415c9a6bd508a13 (diff) | |
| parent | 4449eb97834ed6191dc0937d255c475191895980 (diff) | |
| download | spark-f58da6164eaf13dd986a39a40535975096b71b44.tar.gz spark-f58da6164eaf13dd986a39a40535975096b71b44.tar.bz2 spark-f58da6164eaf13dd986a39a40535975096b71b44.zip | |
Merge branch 'master' into dev
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 a4bca02d21..b3af4b1e20 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.4 + /___/ .__/\_,_/_/ /_/\_\ version 0.5.1-SNAPSHOT /_/ """) import Properties._ |