You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/04/15 20:17:25 UTC

svn commit: r1587668 - in /spark: documentation.md site/documentation.html

Author: matei
Date: Tue Apr 15 18:17:24 2014
New Revision: 1587668

URL: http://svn.apache.org/r1587668
Log:
Add AMP Camp 4

Modified:
    spark/documentation.md
    spark/site/documentation.html

Modified: spark/documentation.md
URL: http://svn.apache.org/viewvc/spark/documentation.md?rev=1587668&r1=1587667&r2=1587668&view=diff
==============================================================================
--- spark/documentation.md (original)
+++ spark/documentation.md Tue Apr 15 18:17:24 2014
@@ -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>

Modified: spark/site/documentation.html
URL: http://svn.apache.org/viewvc/spark/site/documentation.html?rev=1587668&r1=1587667&r2=1587668&view=diff
==============================================================================
--- spark/site/documentation.html (original)
+++ spark/site/documentation.html Tue Apr 15 18:17:24 2014
@@ -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>