diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-10-01 11:57:24 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-10-01 11:57:24 +0530 |
| commit | 582969288592063ea4071080e8ff7b9108cf4a8b (patch) | |
| tree | 067a00d847b6a97b2ca840767808feaf40c19936 /repl | |
| parent | 9865fd6aa07fd722c6782ec8001b732c39a98d45 (diff) | |
| parent | 714fdabd99bbff3a0cdec5dcf06b021a3a3f2da8 (diff) | |
| download | spark-582969288592063ea4071080e8ff7b9108cf4a8b.tar.gz spark-582969288592063ea4071080e8ff7b9108cf4a8b.tar.bz2 spark-582969288592063ea4071080e8ff7b9108cf4a8b.zip | |
Merge branch 'master' into scala-2.10
Conflicts:
core/src/main/scala/org/apache/spark/ui/jobs/JobProgressUI.scala
docs/_config.yml
project/SparkBuild.scala
repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala
Diffstat (limited to 'repl')
| -rw-r--r-- | repl/pom.xml | 2 | ||||
| -rw-r--r-- | repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/repl/pom.xml b/repl/pom.xml index a7b5e1f3c7..d4b1ea10be 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> - <version>0.8.0-SNAPSHOT</version> + <version>0.9.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala b/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala index 31596cc02f..21b1ba305d 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala @@ -24,7 +24,7 @@ trait SparkILoopInit { ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ - /___/ .__/\_,_/_/ /_/\_\ version 0.8.0 + /___/ .__/\_,_/_/ /_/\_\ version 0.9.0-SNAPSHOT /_/ """) import Properties._ |