Merge pull request #289 from napalm-automation/master

Master
napalm-automation · Sep 8, 2016 · 17eaec0 · 17eaec0
2 parents 109f3e0 + 3fba7e9
commit 17eaec0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/docs/hackathons/hackathon2016/agenda.rst b/docs/hackathons/hackathon2016/agenda.rst
@@ -7,9 +7,10 @@ ______
 Friday 16th of Sept
 ^^^^^^^^^^^^^^^^^^^
 
-* **6.00 pm - 7.00 pm** - Kick off. Short introduction about napalm and the hackathon.
-* **7.00 pm - 8.00 pm** - Propose tasks, create teams...
-* **7.00 pm - 11.59 pm** - Hacking.
+* **6.00 pm - 7.00 pm** - Kick off. Short introduction about napalm, news about the project, vision for the future and some basic information about the hackathon.
+* **7.00 pm - 7.30 pm** - Keynote: Ivan Pepelnjak - ipSpace.net
+* **7.30 pm - 8.30 pm** - Propose tasks, create teams...
+* **8.30 pm - 11.59 pm** - Hacking.
 
 Saturday 17th of Sept
 ^^^^^^^^^^^^^^^^^^^^^

diff --git a/docs/hackathons/hackathon2016/index.rst b/docs/hackathons/hackathon2016/index.rst
@@ -17,7 +17,7 @@ Quick Information
 -----------------
 
 +-----------------+-----------------------------------------------+
-| **Date**        | 17, 18 and 19th of September                  |
+| **Date**        | 16, 17 and 18th of September                  |
 +-----------------+-----------------------------------------------+
 | **Location**    | :doc:`Here for more information <locations>`  |
 +-----------------+-----------------------------------------------+

diff --git a/docs/hackathons/hackathon2016/locations.rst b/docs/hackathons/hackathon2016/locations.rst
@@ -13,7 +13,18 @@ Apparently there is something called real life and people like to gather in grou
 Known gatherings
 ^^^^^^^^^^^^^^^^
 
-* London, exact location TBD
+* London, UK::
+
+     CloudFlare, 25 Lavington St, London SE1 0NZ
+     Contact: Mircea, @mirceaulinic (slack), tel: +447427735256
+
+* San Francisco, United states::
+
+    Contact ktbyers@twb-tech.com for details
+
+* Krakow, Poland::
+
+    Contact elisa@bigwaveit.org for details