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 /docs/_config.yml | |
| 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 'docs/_config.yml')
| -rw-r--r-- | docs/_config.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/_config.yml b/docs/_config.yml index ad851673a5..02067f9750 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -3,8 +3,8 @@ markdown: kramdown # These allow the documentation to be updated with nerw releases # of Spark, Scala, and Mesos. -SPARK_VERSION: 0.8.0-SNAPSHOT -SPARK_VERSION_SHORT: 0.8.0 +SPARK_VERSION: 0.9.0-incubating-SNAPSHOT +SPARK_VERSION_SHORT: 0.9.0-SNAPSHOT SCALA_VERSION: 2.10 MESOS_VERSION: 0.13.0 SPARK_ISSUE_TRACKER_URL: https://spark-project.atlassian.net |