Skip to content

Commit

Permalink
Updating versions for branch-1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pwendell committed Jul 12, 2014
1 parent ea434cf commit 2a5514f
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/SparkContext.scala
Expand Up @@ -1265,7 +1265,7 @@ class SparkContext(config: SparkConf) extends Logging {
*/
object SparkContext extends Logging {

private[spark] val SPARK_VERSION = "1.0.1"
private[spark] val SPARK_VERSION = "1.0.2"

private[spark] val SPARK_JOB_DESCRIPTION = "spark.job.description"

Expand Down
4 changes: 2 additions & 2 deletions docs/_config.yml
Expand Up @@ -3,8 +3,8 @@ markdown: kramdown

# These allow the documentation to be updated with nerw releases
# of Spark, Scala, and Mesos.
SPARK_VERSION: 1.0.1
SPARK_VERSION_SHORT: 1.0.1
SPARK_VERSION: 1.0.2
SPARK_VERSION_SHORT: 1.0.2
SCALA_BINARY_VERSION: "2.10"
SCALA_VERSION: "2.10.4"
MESOS_VERSION: 0.18.1
Expand Down
2 changes: 1 addition & 1 deletion extras/java8-tests/pom.xml
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent</artifactId>
<version>1.0.1</version>
<version>1.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion project/SparkBuild.scala
Expand Up @@ -32,7 +32,7 @@ import scala.collection.JavaConversions._
// import com.jsuereth.pgp.sbtplugin.PgpKeys._

object SparkBuild extends Build {
val SPARK_VERSION = "1.0.1"
val SPARK_VERSION = "1.0.2-SNAPSHOT"
val SPARK_VERSION_SHORT = SPARK_VERSION.replaceAll("-SNAPSHOT", "")

// Hadoop version to build against. For example, "1.0.4" for Apache releases, or
Expand Down
2 changes: 1 addition & 1 deletion project/project/SparkPluginBuild.scala
Expand Up @@ -26,7 +26,7 @@ import sbt.Keys._
object SparkPluginDef extends Build {
lazy val root = Project("plugins", file(".")) dependsOn(sparkStyle)
lazy val sparkStyle = Project("spark-style", file("spark-style"), settings = styleSettings)
val sparkVersion = "1.0.1"
val sparkVersion = "1.0.2-SNAPSHOT"
// There is actually no need to publish this artifact.
def styleSettings = Defaults.defaultSettings ++ Seq (
name := "spark-style",
Expand Down
2 changes: 1 addition & 1 deletion python/epydoc.conf
Expand Up @@ -18,7 +18,7 @@
#

# Information about the project.
name: Spark 1.0.1 Python API Docs
name: Spark 1.0.2 Python API Docs
url: http://spark.apache.org

# The list of modules to document. Modules can be named using
Expand Down
2 changes: 1 addition & 1 deletion python/pyspark/shell.py
Expand Up @@ -46,7 +46,7 @@
____ __
/ __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/
/__ / .__/\_,_/_/ /_/\_\ version 1.0.1
/__ / .__/\_,_/_/ /_/\_\ version 1.0.2-SNAPSHOT
/_/
""")
print("Using Python version %s (%s, %s)" % (
Expand Down
Expand Up @@ -26,7 +26,7 @@ trait SparkILoopInit {
____ __
/ __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/
/___/ .__/\_,_/_/ /_/\_\ version 1.0.1
/___/ .__/\_,_/_/ /_/\_\ version 1.0.2-SNAPSHOT
/_/
""")
import Properties._
Expand Down
2 changes: 1 addition & 1 deletion yarn/alpha/pom.xml
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>yarn-parent_2.10</artifactId>
<version>1.0.1</version>
<version>1.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 2a5514f

Please sign in to comment.