diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-04-24 18:08:26 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-04-24 18:08:26 +0530 |
| commit | ad88f083a627ba38e99b1b135a82a1fcfd107444 (patch) | |
| tree | bd6571711c8a1983360e4a61b40f1d917f690e17 /repl | |
| parent | 185bb9525a3a48313cd5e446e1b80d2d697465d8 (diff) | |
| download | spark-ad88f083a627ba38e99b1b135a82a1fcfd107444.tar.gz spark-ad88f083a627ba38e99b1b135a82a1fcfd107444.tar.bz2 spark-ad88f083a627ba38e99b1b135a82a1fcfd107444.zip | |
scala 2.10 and master merge
Diffstat (limited to 'repl')
| -rw-r--r-- | repl/src/main/scala/spark/repl/SparkILoop.scala | 15 | ||||
| -rw-r--r-- | repl/src/main/scala/spark/repl/SparkILoopInit.scala | 2 | ||||
| -rw-r--r-- | repl/src/test/scala/spark/repl/ReplSuiteMixin.scala | 1 |
3 files changed, 2 insertions, 16 deletions
diff --git a/repl/src/main/scala/spark/repl/SparkILoop.scala b/repl/src/main/scala/spark/repl/SparkILoop.scala index e83e403760..2b6e7b68bf 100644 --- a/repl/src/main/scala/spark/repl/SparkILoop.scala +++ b/repl/src/main/scala/spark/repl/SparkILoop.scala @@ -222,21 +222,6 @@ class SparkILoop(in0: Option[BufferedReader], protected val out: JPrintWriter, } } - /** Print a welcome message */ - def printWelcome() { - echo("""Welcome to - ____ __ - / __/__ ___ _____/ /__ - _\ \/ _ \/ _ `/ __/ '_/ - /___/ .__/\_,_/_/ /_/\_\ version 0.8.0 - /_/ -""") - import Properties._ - val welcomeMsg = "Using Scala %s (%s, Java %s)".format( - versionString, javaVmName, javaVersion) - echo(welcomeMsg) - } - /** Show the history */ lazy val historyCommand = new LoopCommand("history", "show the history (optional num is commands to show)") { override def usage = "[num]" diff --git a/repl/src/main/scala/spark/repl/SparkILoopInit.scala b/repl/src/main/scala/spark/repl/SparkILoopInit.scala index 6ae535c4e6..8b7da3d3c6 100644 --- a/repl/src/main/scala/spark/repl/SparkILoopInit.scala +++ b/repl/src/main/scala/spark/repl/SparkILoopInit.scala @@ -24,7 +24,7 @@ trait SparkILoopInit { ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ - /___/ .__/\_,_/_/ /_/\_\ version 0.7.1-SNAPSHOT + /___/ .__/\_,_/_/ /_/\_\ version 0.8.0 /_/ """) import Properties._ diff --git a/repl/src/test/scala/spark/repl/ReplSuiteMixin.scala b/repl/src/test/scala/spark/repl/ReplSuiteMixin.scala index fd1a1b1e7c..8f439f0681 100644 --- a/repl/src/test/scala/spark/repl/ReplSuiteMixin.scala +++ b/repl/src/test/scala/spark/repl/ReplSuiteMixin.scala @@ -17,6 +17,7 @@ trait ReplSuiteMixin { val localIp = "127.0.1.2" val port = "7089" val sparkUrl = s"spark://$localIp:$port" + def setupStandaloneCluster() { future { Master.main(Array("-i", localIp, "-p", port, "--webui-port", "0")) } Thread.sleep(2000) |