Author: matei
Date: Fri Jul 18 20:52:58 2014
New Revision: 1611799
URL: http://svn.apache.org/r1611799
Log:
Added Summit 2014 training links
Modified:
spark/documentation.md
spark/site/documentation.html
Modified: spark/documentation.md
URL:
http://svn.apache.org/viewvc/spark/documentation.md?rev=1611799&r1=1611798&r2=1611799&view=diff
==============================================================================
--- spark/documentation.md (original)
+++ spark/documentation.md Fri Jul 18 20:52:58 2014
@@ -91,16 +91,11 @@ In addition to the videos listed below,
</ul>
-<h3>Hands-On Exercises</h3>
-
-<ul>
- <li><a href="http://spark-summit.org/2013/exercises/";>Hands-on exercises</a>
are available online from Spark Summit 2013. These exercises let you launch a
small EC2 cluster, load a dataset, and query it with Spark, Shark, Spark
Streaming, and MLlib.</li>
-</ul>
-
<a name="summit"></a>
<h3>Training Materials</h3>
<ul>
- <li>The 2nd day of <a href="http://spark-summit.org/2013";>Spark Summit
2013</a> was a training session, and you can find the slides and videos from
that inline in <a
href="http://spark-summit.org/summit-2013/#agendapluginwidget-5";>the training
day agenda</a>.
+ <li><a href="http://spark-summit.org/2014/training";>Training materials and
exercises from Spark Summit 2014</a> are available online. These include videos
and slides of talks as well as exercises you can run on your laptop. Topics
include Spark core, tuning and debugging, Spark SQL, Spark Streaming, GraphX
and MLlib.</li>
+ <li><a href="http://spark-summit.org/2013";>Spark Summit 2013</a> included a
training session, with slides and videos available on <a
href="http://spark-summit.org/summit-2013/#agendapluginwidget-5";>the training
day agenda</a>.
The session also included <a
href="http://spark-summit.org/2013/exercises/";>exercises</a> that you can walk
through yourself, which will guide you through launching a Spark cluster on EC2
and using various Spark components to analyze real data.</li>
<li>The <a href="https://amplab.cs.berkeley.edu/";>UC Berkeley AMPLab</a>
regularly hosts training camps on Spark and related projects.
Slides, videos and EC2-based exercises from each of these are available online:
@@ -113,6 +108,14 @@ Slides, videos and EC2-based exercises f
</li>
</ul>
+
+<h3>Hands-On Exercises</h3>
+
+<ul>
+ <li><a href="http://spark-summit.org/2014/training";>Hands-on exercises from
Spark Summit 2014</a>. These let you install Spark on your laptop and learn
basic concepts, Spark SQL, Spark Streaming, GraphX and MLlib.</li>
+ <li><a href="http://spark-summit.org/2013/exercises/";>Hands-on exercises
from Spark Summit 2013</a>. These exercises let you launch a small EC2 cluster,
load a dataset, and query it with Spark, Shark, Spark Streaming, and MLlib.</li>
+</ul>
+
<h3>External Tutorials, Blog Posts, and Talks</h3>
<ul>
Modified: spark/site/documentation.html
URL:
http://svn.apache.org/viewvc/spark/site/documentation.html?rev=1611799&r1=1611798&r2=1611799&view=diff
==============================================================================
--- spark/site/documentation.html (original)
+++ spark/site/documentation.html Fri Jul 18 20:52:58 2014
@@ -240,16 +240,11 @@
</ul>
-<h3>Hands-On Exercises</h3>
-
-<ul>
- <li><a href="http://spark-summit.org/2013/exercises/";>Hands-on exercises</a>
are available online from Spark Summit 2013. These exercises let you launch a
small EC2 cluster, load a dataset, and query it with Spark, Shark, Spark
Streaming, and MLlib.</li>
-</ul>
-
<p><a name="summit"></a></p>
<h3>Training Materials</h3>
<ul>
- <li>The 2nd day of <a href="http://spark-summit.org/2013";>Spark Summit
2013</a> was a training session, and you can find the slides and videos from
that inline in <a
href="http://spark-summit.org/summit-2013/#agendapluginwidget-5";>the training
day agenda</a>.
+ <li><a href="http://spark-summit.org/2014/training";>Training materials and
exercises from Spark Summit 2014</a> are available online. These include videos
and slides of talks as well as exercises you can run on your laptop. Topics
include Spark core, tuning and debugging, Spark SQL, Spark Streaming, GraphX
and MLlib.</li>
+ <li><a href="http://spark-summit.org/2013";>Spark Summit 2013</a> included a
training session, with slides and videos available on <a
href="http://spark-summit.org/summit-2013/#agendapluginwidget-5";>the training
day agenda</a>.
The session also included <a
href="http://spark-summit.org/2013/exercises/";>exercises</a> that you can walk
through yourself, which will guide you through launching a Spark cluster on EC2
and using various Spark components to analyze real data.</li>
<li>The <a href="https://amplab.cs.berkeley.edu/";>UC Berkeley AMPLab</a>
regularly hosts training camps on Spark and related projects.
Slides, videos and EC2-based exercises from each of these are available online:
@@ -262,6 +257,13 @@ Slides, videos and EC2-based exercises f
</li>
</ul>
+<h3>Hands-On Exercises</h3>
+
+<ul>
+ <li><a href="http://spark-summit.org/2014/training";>Hands-on exercises from
Spark Summit 2014</a>. These let you install Spark on your laptop and learn
basic concepts, Spark SQL, Spark Streaming, GraphX and MLlib.</li>
+ <li><a href="http://spark-summit.org/2013/exercises/";>Hands-on exercises
from Spark Summit 2013</a>. These exercises let you launch a small EC2 cluster,
load a dataset, and query it with Spark, Shark, Spark Streaming, and MLlib.</li>
+</ul>
+
<h3>External Tutorials, Blog Posts, and Talks</h3>
<ul>
