diff options
author | GuoQiang Li <witgo@qq.com> | 2014-09-06 15:08:43 -0700 |
---|---|---|
committer | Josh Rosen <joshrosen@apache.org> | 2014-09-06 15:08:43 -0700 |
commit | 21a1e1bb893512b2f68598ab0c0ec8c33e8d9909 (patch) | |
tree | 3f54ef947532e66a8d1c525e9cc40522a5aa399a /repl/src | |
parent | 607ae39c22947dad8e65cbcec310367925f62eba (diff) | |
download | spark-21a1e1bb893512b2f68598ab0c0ec8c33e8d9909.tar.gz spark-21a1e1bb893512b2f68598ab0c0ec8c33e8d9909.tar.bz2 spark-21a1e1bb893512b2f68598ab0c0ec8c33e8d9909.zip |
[SPARK-3273][SPARK-3301]We should read the version information from the same place
Author: GuoQiang Li <witgo@qq.com>
Closes #2175 from witgo/SPARK-3273 and squashes the following commits:
cf9c65a [GuoQiang Li] We should read the version information from the same place
2a44e2f [GuoQiang Li] The spark version in the welcome message of pyspark is not correct
Diffstat (limited to 'repl/src')
-rw-r--r-- | repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala | 6 |
1 files changed, 4 insertions, 2 deletions
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 910b31d209..7667a9c119 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala @@ -14,6 +14,8 @@ import scala.reflect.internal.util.Position import scala.util.control.Exception.ignoring import scala.tools.nsc.util.stackTraceString +import org.apache.spark.SPARK_VERSION + /** * Machinery for the asynchronous initialization of the repl. */ @@ -26,9 +28,9 @@ trait SparkILoopInit { ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ - /___/ .__/\_,_/_/ /_/\_\ version 1.0.0-SNAPSHOT + /___/ .__/\_,_/_/ /_/\_\ version %s /_/ -""") +""".format(SPARK_VERSION)) import Properties._ val welcomeMsg = "Using Scala %s (%s, Java %s)".format( versionString, javaVmName, javaVersion) |