diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-10-05 22:57:05 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-10-05 22:57:05 -0700 |
| commit | d585613ee22ed9292a69e35cedb0d5965f4c906f (patch) | |
| tree | 5658cef11f24e98d5083a93320b9d465eb4f54ef /docs | |
| parent | 4a25b116d4e451afdf10fc4f018c383ed2c7789a (diff) | |
| parent | aa9fb849940bb7220286ce327f4fdb1706c6390e (diff) | |
| download | spark-d585613ee22ed9292a69e35cedb0d5965f4c906f.tar.gz spark-d585613ee22ed9292a69e35cedb0d5965f4c906f.tar.bz2 spark-d585613ee22ed9292a69e35cedb0d5965f4c906f.zip | |
Merge pull request #37 from pwendell/merge-0.8
merge in remaining changes from `branch-0.8`
This merges in the following changes from `branch-0.8`:
- The scala version is included in the published maven artifact names
- A unit tests which had non-deterministic failures is ignored (see SPARK-908)
- A minor documentation change shows the short version instead of the full version
- Moving the kafka jar to be "provided"
- Changing the default spark ec2 version.
- Some spacing changes caused by Maven's release plugin
Note that I've squashed this into a single commit rather than pull in the branch-0.8 history. There are a bunch of release/revert commits there that make the history super ugly.
Diffstat (limited to 'docs')
| -rwxr-xr-x | docs/_layouts/global.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/_layouts/global.html b/docs/_layouts/global.html index 238ad26de0..0c1d657cde 100755 --- a/docs/_layouts/global.html +++ b/docs/_layouts/global.html @@ -6,7 +6,7 @@ <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> - <title>{{ page.title }} - Spark {{site.SPARK_VERSION}} Documentation</title> + <title>{{ page.title }} - Spark {{site.SPARK_VERSION_SHORT}} Documentation</title> <meta name="description" content=""> <link rel="stylesheet" href="css/bootstrap.min.css"> @@ -109,7 +109,7 @@ </ul> </li> </ul> - <!--<p class="navbar-text pull-right"><span class="version-text">v{{site.SPARK_VERSION}}</span></p>--> + <!--<p class="navbar-text pull-right"><span class="version-text">v{{site.SPARK_VERSION_SHORT}}</span></p>--> </div> </div> </div> |