diff options
| author | Matei Alexandru Zaharia <matei@apache.org> | 2014-12-01 20:56:05 +0000 |
|---|---|---|
| committer | Matei Alexandru Zaharia <matei@apache.org> | 2014-12-01 20:56:05 +0000 |
| commit | 94cc830cdb1265fe43554f47b0e00070b853e1b5 (patch) | |
| tree | 3841f0afe877122c5b8024963e8212dec66333a7 /site/community.html | |
| parent | d2434c1fdfdc16edb77d015b1dc4bcfd58296400 (diff) | |
| download | spark-website-94cc830cdb1265fe43554f47b0e00070b853e1b5.tar.gz spark-website-94cc830cdb1265fe43554f47b0e00070b853e1b5.tar.bz2 spark-website-94cc830cdb1265fe43554f47b0e00070b853e1b5.zip | |
tweaks to conferences
Diffstat (limited to 'site/community.html')
| -rw-r--r-- | site/community.html | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/site/community.html b/site/community.html index 3cc0cf541..bdf40bc77 100644 --- a/site/community.html +++ b/site/community.html @@ -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 the <a href="https://amplab.cs.berkeley.e 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> |