diff options
| author | Josh Rosen <joshrosen@eecs.berkeley.edu> | 2012-12-29 16:00:51 -0800 |
|---|---|---|
| committer | Josh Rosen <joshrosen@eecs.berkeley.edu> | 2012-12-29 16:00:51 -0800 |
| commit | c5cee53f2092ee2825095a1831ca47f1c41afc2f (patch) | |
| tree | 29c36f14668e67493b2c8ed98cb4d4124baf841e /docs/_config.yml | |
| parent | 26186e2d259f3aa2db9c8594097fd342107ce147 (diff) | |
| parent | 3f74f729a190924b7634e08a381232af36aeb328 (diff) | |
| download | spark-c5cee53f2092ee2825095a1831ca47f1c41afc2f.tar.gz spark-c5cee53f2092ee2825095a1831ca47f1c41afc2f.tar.bz2 spark-c5cee53f2092ee2825095a1831ca47f1c41afc2f.zip | |
Merge remote-tracking branch 'origin/master' into python-api
Conflicts:
docs/quick-start.md
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 ad07e3c40d..2bd2eecc86 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -3,7 +3,7 @@ markdown: kramdown # These allow the documentation to be updated with nerw releases # of Spark, Scala, and Mesos. -SPARK_VERSION: 0.6.0 -SPARK_VERSION_SHORT: 0.6.0 +SPARK_VERSION: 0.7.0-SNAPSHOT +SPARK_VERSION_SHORT: 0.7.0 SCALA_VERSION: 2.9.2 MESOS_VERSION: 0.9.0-incubating |