summaryrefslogtreecommitdiff
path: root/site/news/run-spark-and-shark-on-amazon-emr.html
diff options
context:
space:
mode:
Diffstat (limited to 'site/news/run-spark-and-shark-on-amazon-emr.html')
-rw-r--r--site/news/run-spark-and-shark-on-amazon-emr.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/site/news/run-spark-and-shark-on-amazon-emr.html b/site/news/run-spark-and-shark-on-amazon-emr.html
index c61fd0eb1..cf4df866e 100644
--- a/site/news/run-spark-and-shark-on-amazon-emr.html
+++ b/site/news/run-spark-and-shark-on-amazon-emr.html
@@ -96,7 +96,7 @@
</a>
<ul class="dropdown-menu">
<li><a href="/documentation.html">Overview</a></li>
- <li><a href="/docs/latest/">Latest Release</a></li>
+ <li><a href="/docs/latest/">Latest Release (Spark 1.0)</a></li>
<li><a href="/examples.html">Examples</a></li>
</ul>
</li>
@@ -124,6 +124,9 @@
<h5>Latest News</h5>
<ul class="list-unstyled">
+ <li><a href="/news/two-weeks-to-spark-summit-2014.html">Two weeks to Spark Summit 2014</a>
+ <span class="small">(Jun 16, 2014)</span></li>
+
<li><a href="/news/spark-1-0-0-released.html">Spark 1.0.0 released</a>
<span class="small">(May 30, 2014)</span></li>
@@ -133,9 +136,6 @@
<li><a href="/news/spark-0-9-1-released.html">Spark 0.9.1 released</a>
<span class="small">(Apr 09, 2014)</span></li>
- <li><a href="/news/submit-talks-to-spark-summit-2014.html">Submissions and registration open for Spark Summit 2014</a>
- <span class="small">(Mar 20, 2014)</span></li>
-
</ul>
<p class="small" style="text-align: right;"><a href="/news/index.html">Archive</a></p>
</div>
@@ -160,7 +160,7 @@
<h2>Spark/Shark Tutorial for Amazon EMR</h2>
-<p>This weekend, Amazon posted an <a href="http://aws.amazon.com/articles/Elastic-MapReduce/4926593393724923">article</a> and code that make it easy to launch Spark and Shark on Elastic MapReduce. The article includes examples of how to run both interactive Scala commands and SQL queries from Shark on data in S3. Head over to the <a href="http://aws.amazon.com/articles/Elastic-MapReduce/4926593393724923">Amazon article</a> for details. We&#8217;re very excited because, to our knowledge, this makes Spark the first non-Hadoop engine that you can launch with EMR.</p>
+<p>This weekend, Amazon posted an <a href="http://aws.amazon.com/articles/Elastic-MapReduce/4926593393724923">article</a> and code that make it easy to launch Spark and Shark on Elastic MapReduce. The article includes examples of how to run both interactive Scala commands and SQL queries from Shark on data in S3. Head over to the <a href="http://aws.amazon.com/articles/Elastic-MapReduce/4926593393724923">Amazon article</a> for details. We’re very excited because, to our knowledge, this makes Spark the first non-Hadoop engine that you can launch with EMR.</p>
<p>