diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-08 12:43:17 -0400 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-08 12:43:17 -0400 |
| commit | 65caa8f711d8e8b7cf77255d0ca42163f07f426e (patch) | |
| tree | 58f34f408fec722d531d46beeda263e7444cf8e2 /repl | |
| parent | 054feb6448578de5542f9ef54d4cc88f706c22f5 (diff) | |
| parent | bc8ba222ff29d46cd2e3331753c9c4ce681eccb4 (diff) | |
| download | spark-65caa8f711d8e8b7cf77255d0ca42163f07f426e.tar.gz spark-65caa8f711d8e8b7cf77255d0ca42163f07f426e.tar.bz2 spark-65caa8f711d8e8b7cf77255d0ca42163f07f426e.zip | |
Merge remote-tracking branch 'jey/bump-development-version-to-0.8.0'
Conflicts:
docs/_config.yml
project/SparkBuild.scala
Diffstat (limited to 'repl')
| -rw-r--r-- | repl/pom.xml | 2 | ||||
| -rw-r--r-- | repl/src/main/scala/spark/repl/SparkILoop.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/repl/pom.xml b/repl/pom.xml index a3e4606edc..0b5e400c3d 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.spark-project</groupId> <artifactId>spark-parent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.8.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/repl/src/main/scala/spark/repl/SparkILoop.scala b/repl/src/main/scala/spark/repl/SparkILoop.scala index cd7b5128b2..23556dbc8f 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.7.1 + /___/ .__/\_,_/_/ /_/\_\ version 0.8.0 /_/ """) import Properties._ |