Author: matei Date: Mon Dec 1 20:56:05 2014 New Revision: 1642751 URL: http://svn.apache.org/r1642751 Log: tweaks to conferences
Modified: spark/community.md spark/site/community.html Modified: spark/community.md URL: http://svn.apache.org/viewvc/spark/community.md?rev=1642751&r1=1642750&r2=1642751&view=diff ============================================================================== --- spark/community.md (original) +++ spark/community.md Mon Dec 1 20:56:05 2014 @@ -31,14 +31,18 @@ navigation: <a name="events"></a> <h3>Events and Meetups</h3> -<h4>Conferences</h4> +<h4>Upcoming Conferences</h4> <ul> <li> - <a href="http://spark-summit.org/2015">Spark Summit 2015.</a> June 15 - 17 in San Francisco. + <a href="http://spark-summit.org/east">Spark Summit East 2015.</a> March 18 - 19 in New York City. </li> <li> - <a href="http://spark-summit.org/east">Spark Summit East 2015.</a> March 18 - 19 in New York City. + <a href="http://spark-summit.org/2015">Spark Summit 2015.</a> June 15 - 17 in San Francisco. </li> +</ul> + +<h4>Past Conferences</h4> +<ul> <li> <a href="http://spark-summit.org/2014">Spark Summit 2014.</a> June 30 - July 1 2014 in San Francisco. Two days of keynotes and over 50 talks and technology demos by Spark community members. Slides, videos and training materials are available for free at <a href="http://spark-summit.org/2014/">the summit website</a>. </li> @@ -123,13 +127,9 @@ Spark started as a research project at t in 2009, and was open sourced in early 2010. Many of the ideas behind the system are presented in various <a href="{{site.url}}research.html">research papers</a>. -The AMPLab continues to perform research on both improving Spark and on systems built on top, such as -<a href="{{site.url}}sql/">Spark SQL</a>, <a href="{{site.url}}graphx/">GraphX</a>, and -<a href="{{site.url}}streaming/">Spark Streaming</a>. </p> <p> -After being released, Spark grew a developer community on GitHub and entered Apache in 2013 -as its permanent home. -A wide range of contributors now develop the project (over 400 developers from 50 companies). +After being released, Spark grew a developer community on GitHub and moved to Apache in 2013. +A wide range of contributors now develop the project (over 400 developers from 100 companies). </p> Modified: spark/site/community.html URL: http://svn.apache.org/viewvc/spark/site/community.html?rev=1642751&r1=1642750&r2=1642751&view=diff ============================================================================== --- spark/site/community.html (original) +++ spark/site/community.html Mon Dec 1 20:56:05 2014 @@ -187,14 +187,18 @@ <p><a name="events"></a></p> <h3>Events and Meetups</h3> -<h4>Conferences</h4> +<h4>Upcoming Conferences</h4> <ul> <li> - <a href="http://spark-summit.org/2015">Spark Summit 2015.</a> June 15 - 17 in San Francisco. + <a href="http://spark-summit.org/east">Spark Summit East 2015.</a> March 18 - 19 in New York City. </li> <li> - <a href="http://spark-summit.org/east">Spark Summit East 2015.</a> March 18 - 19 in New York City. + <a href="http://spark-summit.org/2015">Spark Summit 2015.</a> June 15 - 17 in San Francisco. </li> +</ul> + +<h4>Past Conferences</h4> +<ul> <li> <a href="http://spark-summit.org/2014">Spark Summit 2014.</a> June 30 - July 1 2014 in San Francisco. Two days of keynotes and over 50 talks and technology demos by Spark community members. Slides, videos and training materials are available for free at <a href="http://spark-summit.org/2014/">the summit website</a>. </li> @@ -278,15 +282,11 @@ Spark started as a research project at t in 2009, and was open sourced in early 2010. Many of the ideas behind the system are presented in various <a href="/research.html">research papers</a>. -The AMPLab continues to perform research on both improving Spark and on systems built on top, such as -<a href="/sql/">Spark SQL</a>, <a href="/graphx/">GraphX</a>, and -<a href="/streaming/">Spark Streaming</a>. </p> <p> -After being released, Spark grew a developer community on GitHub and entered Apache in 2013 -as its permanent home. -A wide range of contributors now develop the project (over 400 developers from 50 companies). +After being released, Spark grew a developer community on GitHub and moved to Apache in 2013. +A wide range of contributors now develop the project (over 400 developers from 100 companies). </p> </div> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org