summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatei Alexandru Zaharia <matei@apache.org>2014-04-15 18:17:24 +0000
committerMatei Alexandru Zaharia <matei@apache.org>2014-04-15 18:17:24 +0000
commitf848dad94491c7340e8d72a1e1e90a514a2d0ebc (patch)
tree465effcd41fbf11ca1d5ee6dfeb779b78b58d2d4
parent820b594d62fb42908c811c6dcacee989e508d47e (diff)
downloadspark-website-f848dad94491c7340e8d72a1e1e90a514a2d0ebc.tar.gz
spark-website-f848dad94491c7340e8d72a1e1e90a514a2d0ebc.tar.bz2
spark-website-f848dad94491c7340e8d72a1e1e90a514a2d0ebc.zip
Add AMP Camp 4
-rw-r--r--documentation.md4
-rw-r--r--site/documentation.html4
2 files changed, 6 insertions, 2 deletions
diff --git a/documentation.md b/documentation.md
index 1b3939d18..cc48409f1 100644
--- a/documentation.md
+++ b/documentation.md
@@ -47,8 +47,9 @@ navigation:
<a href="http://spark-summit.org/summit-2013/#day2">slides and videos</a> are available for free online.
The session also included <a href="http://spark-summit.org/2013/exercises/">exercises</a> that you can run on Amazon EC2.</li>
<li>The <a href="https://amplab.cs.berkeley.edu/">UC Berkeley AMPLab</a> regularly hosts training camps on Spark and related projects.
-Slides and videos are available online:
+Slides, videos and EC2-based exercises are available online:
<ul>
+ <li><a href="http://ampcamp.berkeley.edu/4/">AMP Camp Four</a> (Strata Santa Clara, February 2013) &mdash; focused on new components of the Spark stack</li>
<li><a href="http://ampcamp.berkeley.edu/3/">AMP Camp Three</a> (Berkeley, CA, August 2013)</li>
<li><a href="http://ampcamp.berkeley.edu/amp-camp-two-strata-2013/">AMP Camp Two</a> (Strata Santa Clara, February 2013)</li>
<li><a href="http://ampcamp.berkeley.edu/agenda-2012/">AMP Camp One</a> (Berkeley, CA, August 2012)</li>
@@ -60,6 +61,7 @@ Slides and videos are available online:
<ul>
<li><a href="http://engineering.ooyala.com/blog/using-parquet-and-scrooge-spark">Using Parquet and Scrooge with Spark</a> &mdash; Scala-friendly Parquet and Avro usage tutorial from Ooyala's Evan Chan</li>
+ <li><a href="http://engineering.ooyala.com/blog/using-parquet-and-scrooge-spark">Using Parquet and Scrooge with Spark</a> &mdash; Scala-friendly Parquet and Avro usage tutorial from Ooyala's Evan Chan</li>
<li><a href="http://codeforhire.com/2014/02/18/using-spark-with-mongodb/">Using Spark with MongoDB</a> &mdash; by Sampo Niskanen from Wellmo</li>
<li><a href="http://spark-summit.org/2013">Spark Summit 2013</a> &mdash; contained 30 talks about Spark use cases, available as slides and videos</li>
<li><a href="http://www.pwendell.com/2013/09/28/declarative-streams.html">Sampling Twitter Using Declarative Streams</a> &mdash; Spark Streaming tutorial by Patrick Wendell</li>
diff --git a/site/documentation.html b/site/documentation.html
index c829bbc1e..b8041aedf 100644
--- a/site/documentation.html
+++ b/site/documentation.html
@@ -197,8 +197,9 @@
<a href="http://spark-summit.org/summit-2013/#day2">slides and videos</a> are available for free online.
The session also included <a href="http://spark-summit.org/2013/exercises/">exercises</a> that you can run on Amazon EC2.</li>
<li>The <a href="https://amplab.cs.berkeley.edu/">UC Berkeley AMPLab</a> regularly hosts training camps on Spark and related projects.
-Slides and videos are available online:
+Slides, videos and EC2-based exercises are available online:
<ul>
+ <li><a href="http://ampcamp.berkeley.edu/4/">AMP Camp Four</a> (Strata Santa Clara, February 2013) &mdash; focused on new components of the Spark stack</li>
<li><a href="http://ampcamp.berkeley.edu/3/">AMP Camp Three</a> (Berkeley, CA, August 2013)</li>
<li><a href="http://ampcamp.berkeley.edu/amp-camp-two-strata-2013/">AMP Camp Two</a> (Strata Santa Clara, February 2013)</li>
<li><a href="http://ampcamp.berkeley.edu/agenda-2012/">AMP Camp One</a> (Berkeley, CA, August 2012)</li>
@@ -210,6 +211,7 @@ Slides and videos are available online:
<ul>
<li><a href="http://engineering.ooyala.com/blog/using-parquet-and-scrooge-spark">Using Parquet and Scrooge with Spark</a> &mdash; Scala-friendly Parquet and Avro usage tutorial from Ooyala's Evan Chan</li>
+ <li><a href="http://engineering.ooyala.com/blog/using-parquet-and-scrooge-spark">Using Parquet and Scrooge with Spark</a> &mdash; Scala-friendly Parquet and Avro usage tutorial from Ooyala's Evan Chan</li>
<li><a href="http://codeforhire.com/2014/02/18/using-spark-with-mongodb/">Using Spark with MongoDB</a> &mdash; by Sampo Niskanen from Wellmo</li>
<li><a href="http://spark-summit.org/2013">Spark Summit 2013</a> &mdash; contained 30 talks about Spark use cases, available as slides and videos</li>
<li><a href="http://www.pwendell.com/2013/09/28/declarative-streams.html">Sampling Twitter Using Declarative Streams</a> &mdash; Spark Streaming tutorial by Patrick Wendell</li>