summaryrefslogtreecommitdiff
path: root/community.md
diff options
context:
space:
mode:
authorReynold Xin <rxin@apache.org>2015-05-16 06:20:29 +0000
committerReynold Xin <rxin@apache.org>2015-05-16 06:20:29 +0000
commit60133fefdfedbb3a5636e159a6d2bd3230e233ea (patch)
tree87bfda01aea02c9d744754e3eb971a7be40919e5 /community.md
parent983910db8dfd982f8ba9bb0fe8575e510817f363 (diff)
downloadspark-website-60133fefdfedbb3a5636e159a6d2bd3230e233ea.tar.gz
spark-website-60133fefdfedbb3a5636e159a6d2bd3230e233ea.tar.bz2
spark-website-60133fefdfedbb3a5636e159a6d2bd3230e233ea.zip
Added Spark Summit Europe.
Diffstat (limited to 'community.md')
-rw-r--r--community.md9
1 files changed, 6 insertions, 3 deletions
diff --git a/community.md b/community.md
index 23046902d..679bedb34 100644
--- a/community.md
+++ b/community.md
@@ -36,16 +36,19 @@ navigation:
<h4>Conferences</h4>
<ul>
<li>
- <a href="http://spark-summit.org/east">Spark Summit East 2015.</a> March 18 - 19 in New York City.
+ <a href="https://spark-summit.org/">Spark Summit Europe 2015.</a> Oct 27 - Oct 29 in Amsterdam.
</li>
<li>
<a href="http://spark-summit.org/2015">Spark Summit 2015.</a> June 15 - 17 in San Francisco.
</li>
<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>.
+ <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/2014">Spark Summit 2014.</a> June 30 - July 1 2014 in San Francisco.
</li>
<li>
- <a href="http://spark-summit.org/2013">Spark Summit 2013.</a> In December 2013, the community held the first Spark Summit, with 30 talks from organizations using Apache Spark. Slides and videos of all talks are available for free at <a href="http://spark-summit.org/2013/">the summit website</a>.
+ <a href="http://spark-summit.org/2013">Spark Summit 2013.</a> December 2013 in San Francisco.
</li>
</ul>