diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2013-01-15 12:08:51 -0800 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2013-01-15 12:08:51 -0800 |
| commit | cd1521cfdb3c9dd2bf8ced8907afbbbf33893804 (patch) | |
| tree | 76fce28a2fca3fcfbbc3a7f4c7b0fe82cfc695c7 /docs/_layouts | |
| parent | 1638fcb0dce296da22ffc90127d5148a8fab745e (diff) | |
| parent | cb867e9ffb2c5e3d65d50c222fcce3631b94e4dd (diff) | |
| download | spark-cd1521cfdb3c9dd2bf8ced8907afbbbf33893804.tar.gz spark-cd1521cfdb3c9dd2bf8ced8907afbbbf33893804.tar.bz2 spark-cd1521cfdb3c9dd2bf8ced8907afbbbf33893804.zip | |
Merge branch 'master' into streaming
Conflicts:
core/src/main/scala/spark/rdd/CoGroupedRDD.scala
core/src/main/scala/spark/rdd/FilteredRDD.scala
docs/_layouts/global.html
docs/index.md
run
Diffstat (limited to 'docs/_layouts')
| -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 a8be52f23e..94baa634aa 100755 --- a/docs/_layouts/global.html +++ b/docs/_layouts/global.html @@ -47,6 +47,7 @@ <li><a href="quick-start.html">Quick Start</a></li> <li><a href="scala-programming-guide.html">Scala</a></li> <li><a href="java-programming-guide.html">Java</a></li> + <li><a href="python-programming-guide.html">Python</a></li> <li><a href="streaming-programming-guide.html">Spark Streaming</a></li> </ul> </li> @@ -54,10 +55,9 @@ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">API (Scaladoc)<b class="caret"></b></a> <ul class="dropdown-menu"> - <li><a href="api/core/index.html">Spark</a></li> - <li><a href="api/examples/index.html">Spark Examples</a></li> - <li><a href="api/streaming/index.html">Spark Streaming</a></li> - <li><a href="api/bagel/index.html">Bagel</a></li> + <li><a href="api/core/index.html">Spark Scala/Java (Scaladoc)</a></li> + <li><a href="api/pyspark/index.html">Spark Python (Epydoc)</a></li> + <li><a href="api/streaming/index.html">Spark Streaming Scala/Java (Scaladoc) </a></li> </ul> </li> |