diff options
| author | Ankur Dave <ankurdave@gmail.com> | 2014-01-08 21:19:08 -0800 |
|---|---|---|
| committer | Ankur Dave <ankurdave@gmail.com> | 2014-01-08 21:19:08 -0800 |
| commit | 91227566bc9d8aabaec3f2a37a09a17afa20989c (patch) | |
| tree | 80d19aac29217005b3f1cb08ca95fa08bbb9d946 /docs/_layouts/global.html | |
| parent | 7210257ba3038d5e22d4b60fe9c3113dc45c3dff (diff) | |
| parent | 04d83fc37f9eef89c20331c85291a0a169f75e6d (diff) | |
| download | spark-91227566bc9d8aabaec3f2a37a09a17afa20989c.tar.gz spark-91227566bc9d8aabaec3f2a37a09a17afa20989c.tar.bz2 spark-91227566bc9d8aabaec3f2a37a09a17afa20989c.zip | |
Merge remote-tracking branch 'spark-upstream/master' into HEAD
Conflicts:
README.md
core/src/main/scala/org/apache/spark/util/collection/OpenHashMap.scala
core/src/main/scala/org/apache/spark/util/collection/OpenHashSet.scala
core/src/main/scala/org/apache/spark/util/collection/PrimitiveKeyOpenHashMap.scala
pom.xml
project/SparkBuild.scala
repl/src/main/scala/org/apache/spark/repl/SparkILoop.scala
Diffstat (limited to 'docs/_layouts/global.html')
| -rwxr-xr-x | docs/_layouts/global.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/_layouts/global.html b/docs/_layouts/global.html index 0c1d657cde..ad7969d012 100755 --- a/docs/_layouts/global.html +++ b/docs/_layouts/global.html @@ -74,12 +74,12 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">API Docs<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="api/core/index.html">Spark Core for Java/Scala</a></li> + <li><a href="api/core/index.html#org.apache.spark.package">Spark Core for Java/Scala</a></li> <li><a href="api/pyspark/index.html">Spark Core for Python</a></li> <li class="divider"></li> - <li><a href="api/streaming/index.html">Spark Streaming</a></li> - <li><a href="api/mllib/index.html">MLlib (Machine Learning)</a></li> - <li><a href="api/bagel/index.html">Bagel (Pregel on Spark)</a></li> + <li><a href="api/streaming/index.html#org.apache.spark.streaming.package">Spark Streaming</a></li> + <li><a href="api/mllib/index.html#org.apache.spark.mllib.package">MLlib (Machine Learning)</a></li> + <li><a href="api/bagel/index.html#org.apache.spark.bagel.package">Bagel (Pregel on Spark)</a></li> </ul> </li> |