aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorPatrick Wendell <patrick@databricks.com>2015-06-03 10:11:27 -0700
committerPatrick Wendell <patrick@databricks.com>2015-06-03 10:11:27 -0700
commit2c4d550eda0e6f33d2d575825c3faef4c9217067 (patch)
tree772e823c28ba30b0765020e6e11b07133e211d31 /core
parentf1646e1023bd03e27268a8aa2ea11b6cc284075f (diff)
downloadspark-2c4d550eda0e6f33d2d575825c3faef4c9217067.tar.gz
spark-2c4d550eda0e6f33d2d575825c3faef4c9217067.tar.bz2
spark-2c4d550eda0e6f33d2d575825c3faef4c9217067.zip
[SPARK-7801] [BUILD] Updating versions to SPARK 1.5.0
Author: Patrick Wendell <patrick@databricks.com> Closes #6328 from pwendell/spark-1.5-update and squashes the following commits: 2f42d02 [Patrick Wendell] A few more excludes 4bebcf0 [Patrick Wendell] Update to RC4 61aaf46 [Patrick Wendell] Using new release candidate 55f1610 [Patrick Wendell] Another exclude 04b4f04 [Patrick Wendell] More issues with transient 1.4 changes 36f549b [Patrick Wendell] [SPARK-7801] [BUILD] Updating versions to SPARK 1.5.0
Diffstat (limited to 'core')
-rw-r--r--core/pom.xml2
-rw-r--r--core/src/main/scala/org/apache/spark/package.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/pom.xml b/core/pom.xml
index a02184222e..e35694e9e9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/src/main/scala/org/apache/spark/package.scala b/core/src/main/scala/org/apache/spark/package.scala
index 2ab41ba488..8ae76c5f72 100644
--- a/core/src/main/scala/org/apache/spark/package.scala
+++ b/core/src/main/scala/org/apache/spark/package.scala
@@ -43,5 +43,5 @@ package org.apache
package object spark {
// For package docs only
- val SPARK_VERSION = "1.4.0-SNAPSHOT"
+ val SPARK_VERSION = "1.5.0-SNAPSHOT"
}