You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by yh...@apache.org on 2016/12/29 21:08:17 UTC

spark-website git commit: Fix the list of previous spark summits.

Repository: spark-website
Updated Branches:
  refs/heads/asf-site e10180e67 -> 426a68ba8


Fix the list of previous spark summits.


Project: http://git-wip-us.apache.org/repos/asf/spark-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark-website/commit/426a68ba
Tree: http://git-wip-us.apache.org/repos/asf/spark-website/tree/426a68ba
Diff: http://git-wip-us.apache.org/repos/asf/spark-website/diff/426a68ba

Branch: refs/heads/asf-site
Commit: 426a68ba8cd6efeaffdacaa0d2b645c5c5ac6a5e
Parents: e10180e
Author: Yin Huai <yh...@databricks.com>
Authored: Thu Dec 29 13:07:47 2016 -0800
Committer: Yin Huai <yh...@databricks.com>
Committed: Thu Dec 29 13:07:47 2016 -0800

----------------------------------------------------------------------
 community.md        | 19 ++++++++++++++-----
 site/community.html | 19 ++++++++++++++-----
 2 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark-website/blob/426a68ba/community.md
----------------------------------------------------------------------
diff --git a/community.md b/community.md
index d887d31..d8ae250 100644
--- a/community.md
+++ b/community.md
@@ -88,19 +88,28 @@ Chat rooms are great for quick questions or discussions on specialized topics. T
 <h4>Conferences</h4>
 <ul>
   <li>
-    <a href="https://spark-summit.org/">Spark Summit Europe 2015.</a> Oct 27 - Oct 29 in Amsterdam.
+    <a href="https://spark-summit.org/eu-2016/">Spark Summit Europe 2016.</a> Oct 25 - 27 in Brussels.
   </li>
   <li>
-    <a href="http://spark-summit.org/2015">Spark Summit 2015.</a> June 15 - 17 in San Francisco.
+    <a href="https://spark-summit.org/2016/">Spark Summit 2016.</a> June 6 - 8 in San Francisco.
   </li>
   <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/east-2016/">Spark Summit East 2016.</a> Feb 16 - 18 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.
+    <a href="https://spark-summit.org/eu-2015/">Spark Summit Europe 2015.</a> Oct 27 - 29 in Amsterdam.
   </li>
   <li>
-    <a href="http://spark-summit.org/2013">Spark Summit 2013.</a> December 2013 in San Francisco.
+    <a href="https://spark-summit.org/2015">Spark Summit 2015.</a> June 15 - 17 in San Francisco.
+  </li>
+  <li>
+    <a href="https://spark-summit.org/east-2015/">Spark Summit East 2015.</a> March 18 - 19 in New York City.
+  </li>
+  <li>
+    <a href="https://spark-summit.org/2014">Spark Summit 2014.</a> June 30 - July 1 2014 in San Francisco.
+  </li>
+  <li>
+    <a href="https://spark-summit.org/2013">Spark Summit 2013.</a> December 2013 in San Francisco.
   </li>
 </ul>
 

http://git-wip-us.apache.org/repos/asf/spark-website/blob/426a68ba/site/community.html
----------------------------------------------------------------------
diff --git a/site/community.html b/site/community.html
index 7a38701..79604fb 100644
--- a/site/community.html
+++ b/site/community.html
@@ -286,19 +286,28 @@ and include only a few lines of the pertinent code / log within the email.</li>
 <h4>Conferences</h4>
 <ul>
   <li>
-    <a href="https://spark-summit.org/">Spark Summit Europe 2015.</a> Oct 27 - Oct 29 in Amsterdam.
+    <a href="https://spark-summit.org/eu-2016/">Spark Summit Europe 2016.</a> Oct 25 - 27 in Brussels.
   </li>
   <li>
-    <a href="http://spark-summit.org/2015">Spark Summit 2015.</a> June 15 - 17 in San Francisco.
+    <a href="https://spark-summit.org/2016/">Spark Summit 2016.</a> June 6 - 8 in San Francisco.
   </li>
   <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/east-2016/">Spark Summit East 2016.</a> Feb 16 - 18 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.
+    <a href="https://spark-summit.org/eu-2015/">Spark Summit Europe 2015.</a> Oct 27 - 29 in Amsterdam.
   </li>
   <li>
-    <a href="http://spark-summit.org/2013">Spark Summit 2013.</a> December 2013 in San Francisco.
+    <a href="https://spark-summit.org/2015">Spark Summit 2015.</a> June 15 - 17 in San Francisco.
+  </li>
+  <li>
+    <a href="https://spark-summit.org/east-2015/">Spark Summit East 2015.</a> March 18 - 19 in New York City.
+  </li>
+  <li>
+    <a href="https://spark-summit.org/2014">Spark Summit 2014.</a> June 30 - July 1 2014 in San Francisco.
+  </li>
+  <li>
+    <a href="https://spark-summit.org/2013">Spark Summit 2013.</a> December 2013 in San Francisco.
   </li>
 </ul>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org