diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2013-06-24 23:57:47 -0700 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2013-06-24 23:57:47 -0700 |
| commit | c89af0a7f9eebce22dfe2bb4d8b1676ec7f760f6 (patch) | |
| tree | 01f9f42f30a4aa2f73cb200c89a71254bf74d80e /docs/_layouts | |
| parent | 48c7e373c62b2e8cf48157ceb0d92c38c3a40652 (diff) | |
| parent | 78ffe164b33c6b11a2e511442605acd2f795a1b5 (diff) | |
| download | spark-c89af0a7f9eebce22dfe2bb4d8b1676ec7f760f6.tar.gz spark-c89af0a7f9eebce22dfe2bb4d8b1676ec7f760f6.tar.bz2 spark-c89af0a7f9eebce22dfe2bb4d8b1676ec7f760f6.zip | |
Merge branch 'master' into streaming
Conflicts:
.gitignore
Diffstat (limited to 'docs/_layouts')
| -rwxr-xr-x | docs/_layouts/global.html | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/docs/_layouts/global.html b/docs/_layouts/global.html index 94baa634aa..f06ab2d5b0 100755 --- a/docs/_layouts/global.html +++ b/docs/_layouts/global.html @@ -23,6 +23,22 @@ <script src="js/vendor/modernizr-2.6.1-respond-1.1.0.min.js"></script> <link rel="stylesheet" href="css/pygments-default.css"> + + <!-- Google analytics script --> + <script type="text/javascript"> + /* + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-32518208-1']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + */ + </script> + </head> <body> <!--[if lt IE 7]> @@ -53,11 +69,11 @@ </li> <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">API (Scaladoc)<b class="caret"></b></a> + <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 Scala/Java (Scaladoc)</a></li> + <li><a href="api/core/index.html">Spark Java/Scala (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> + <li><a href="api/streaming/index.html">Spark Streaming Java/Scala (Scaladoc) </a></li> </ul> </li> @@ -74,6 +90,7 @@ <li class="dropdown"> <a href="api.html" class="dropdown-toggle" data-toggle="dropdown">More<b class="caret"></b></a> <ul class="dropdown-menu"> + <li><a href="building-with-maven.html">Building Spark with Maven</a></li> <li><a href="configuration.html">Configuration</a></li> <li><a href="tuning.html">Tuning Guide</a></li> <li><a href="bagel-programming-guide.html">Bagel (Pregel on Spark)</a></li> |