Repository: spark
Updated Branches:
  refs/heads/master f2b5b619a -> 2784822e4


[Minor] Fix outdated Spark version

This is causing the event logs to include a file called SPARK_VERSION_1.0.0, 
which is not accurate.

Author: Andrew Or <andrewo...@gmail.com>
Author: andrewor14 <andrewo...@gmail.com>

Closes #2255 from andrewor14/spark-version and squashes the following commits:

1fbdfe9 [andrewor14] Snapshot
805a1c8 [Andrew Or] JK. Update Spark version to 1.2.0 instead.
bffbaab [Andrew Or] Update Spark version to 1.1.0


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2784822e
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2784822e
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2784822e

Branch: refs/heads/master
Commit: 2784822e4c63083a647cc2d6c7089065ef3b947d
Parents: f2b5b61
Author: Andrew Or <andrewo...@gmail.com>
Authored: Wed Sep 3 16:58:19 2014 -0700
Committer: Andrew Or <andrewo...@gmail.com>
Committed: Wed Sep 3 16:58:19 2014 -0700

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/SparkContext.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/2784822e/core/src/main/scala/org/apache/spark/SparkContext.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala 
b/core/src/main/scala/org/apache/spark/SparkContext.scala
index 529febf..6eaf679 100644
--- a/core/src/main/scala/org/apache/spark/SparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -1297,7 +1297,7 @@ class SparkContext(config: SparkConf) extends Logging {
  */
 object SparkContext extends Logging {
 
-  private[spark] val SPARK_VERSION = "1.0.0"
+  private[spark] val SPARK_VERSION = "1.2.0-SNAPSHOT"
 
   private[spark] val SPARK_JOB_DESCRIPTION = "spark.job.description"
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to