diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-08 12:43:17 -0400 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-08 12:43:17 -0400 |
| commit | 65caa8f711d8e8b7cf77255d0ca42163f07f426e (patch) | |
| tree | 58f34f408fec722d531d46beeda263e7444cf8e2 /docs | |
| parent | 054feb6448578de5542f9ef54d4cc88f706c22f5 (diff) | |
| parent | bc8ba222ff29d46cd2e3331753c9c4ce681eccb4 (diff) | |
| download | spark-65caa8f711d8e8b7cf77255d0ca42163f07f426e.tar.gz spark-65caa8f711d8e8b7cf77255d0ca42163f07f426e.tar.bz2 spark-65caa8f711d8e8b7cf77255d0ca42163f07f426e.zip | |
Merge remote-tracking branch 'jey/bump-development-version-to-0.8.0'
Conflicts:
docs/_config.yml
project/SparkBuild.scala
Diffstat (limited to 'docs')
| -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 055ba77c5b..5c135a0242 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.7.1-SNAPSHOT -SPARK_VERSION_SHORT: 0.7.1 +SPARK_VERSION: 0.8.0-SNAPSHOT +SPARK_VERSION_SHORT: 0.8.0 SCALA_VERSION: 2.9.3 MESOS_VERSION: 0.9.0-incubating SPARK_ISSUE_TRACKER_URL: https://spark-project.atlassian.net |