Merge pull request #350 from yvovandoorn/yvovandoorn/InitialDODProgram

devopsdays Amsterdam 2016 - Initial Draft of program
devopsdays · May 14, 2016 · d1bec23 · d1bec23
2 parents 10068f0 + 6f6792b
commit d1bec23
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 40 deletions.
diff --git a/content/events/2016-amsterdam/program.md b/content/events/2016-amsterdam/program.md
@@ -8,116 +8,122 @@ tags = ["amsterdam","amsterdam-2016"]
 +++
 
 <hr>
-<div class="span-16 last ">If you are new to the Open Space concept you may <a href="/pages/open-space-format">want to read some more details</a>.</div>
+<div class="span-14 last ">With talks in the morning and attendee-suggested <a href="/pages/open-space-format">Open Space</a> breakout discussions in the afternoon, we have two full days of content! </div>
 </center>
 <hr />
 
 
-<center><b><h2>The Schedule</h2></b></center>
+<center><b><h2>Schedule</h2></b></center>
 <div class="span-7 append-bottom border">
 
 <div class="span-7 last">
-<h4>Day 1</h4>
+<h4>30 June - Thursday</h4>
 </div>
 
 <div class="span-2">08:00-09:00</div><div class="span-4 box last">Registration, Breakfast, and Sponsor Booths Open</div>
-<div class="span-2">09:00-9:15</div><div class="span-4 box last"><strong></strong>Opening Welcome</div>
+<div class="span-2">09:00-09:15</div><div class="span-4 box last"><strong></strong>Opening Welcome</div>
 <div class="span-2">09:15-09:45</div><div class="span-4 box last">
+<a href="/events/2016-amsterdam/program/erica-baker">Erica Baker (Slack) - Diversity in Technology</a> (Opening keynote)
     <br />
 </div>
-<div class="span-2">09:45-09:55</div><div class="span-4 box last">
+<div class="span-2">09:45-10:00</div><div class="span-4 box last">
   Sponsors
 </div>
-<div class="span-2">09:55-10:25</div><div class="span-4 box last">
+<div class="span-2">10:00-10:30</div><div class="span-4 box last">
+<a href="/events/2016-amsterdam/program/daniel-van-gils">Daniël van Gils (Cloud66) - How the hell do I run my microservices in production, and will it scale?</a>
     <br />
 
 </div>
-<div class="span-2">10:25-10:40</div><div class="span-4 box last">
+<div class="span-2">10:30-10:45</div><div class="span-4 box last">
   Break
 </div>
 
-<div class="span-2">10:40-11:10</div><div class="span-4 box last">
+<div class="span-2">10:45-11:15</div><div class="span-4 box last">
+<a href="/events/2016-amsterdam/program/warner-more">Warner More (CoverMyMeds) - DevOps has Always Been About Security</a>
     <br />
 </div>
 
-<div class="span-2">11:10-11:20</div><div class="span-4 box last">
+<div class="span-2">11:15-11:30</div><div class="span-4 box last">
   Sponsors
 </div>
 
-<div class="span-2">11:20-11:50</div><div class="span-4 box last">
+<div class="span-2">11:30-12:00</div><div class="span-4 box last">
+<a href="/events/2016-amsterdam/program/avishai-ish-shalom">Avishai Ish-Shalom (Fewbytes) - The Mathematics of Reliability</a>
     <br />
 </div>
 
-<div class="span-2">11:50-13:00</div><div class="span-4 append-bottom last">Lunch (catered)</div>
+<div class="span-2">12:00-13:00</div><div class="span-4 append-bottom last">Lunch (catered)</div>
 
-<div class="span-2">13:00-13:30</div><div class="span-4 box last"><strong>Ignites</strong> <br />
-</div>
+<div class="span-2">13:00-14:00</div><div class="span-4 box last"><strong>Open Space</strong> (Open Space) <br /> Open Space Opening</div>
 
-<div class="span-2">13:30-14:00</div><div class="span-4 box last"><strong>Open Space</strong> (Open Space) <br /> Open Space Opening</div>
+<div class="span-2">14:00-14:45</div><div class="span-4 box last"><strong>attendee-suggested <a href="/pages/open-space-format">Open Space</a> breakout discussions</strong> Open Space #1</div>
 
-<div class="span-2">14:00-14:45</div><div class="span-4 box last"><strong>Open Space</strong> (Open Space) <br /> Open Space #1</div>
+<div class="span-2">14:45-15:00</div><div class="span-4 box last"><strong>Break</strong> <br /> </div>
 
-<div class="span-2">15:00-15:45</div><div class="span-4 box last"><strong>Open Space</strong> (Open Space) <br /> Open Space #2</div>
+<div class="span-2">15:00-15:45</div><div class="span-4 box last"><strong>attendee-suggested <a href="/pages/open-space-format">Open Space</a> breakout discussions</strong> Open Space #2</div>
 
-<div class="span-2">16:00-16:45</div><div class="span-4 box last"><strong>Open Space</strong> (Open Space) <br /> Open Space #3</div>
+<div class="span-2">15:45-16:30</div><div class="span-4 box last"><strong>attendee-suggested <a href="/pages/open-space-format">Open Space</a> breakout discussions</strong> Open Space #3</div>
 
-<div class="span-2">16:45-17:00</div><div class="span-4 box last"><strong></strong>Close Day & Logistics</div>
+<div class="span-2">16:30-16:45</div><div class="span-4 box last"><strong></strong>Closing</div>
 
-<div class="span-2">19:00-late</div><div class="span-4 box last"><strong>Evening Event</strong><br /></div>
+<div class="span-2">17:00-18:00</div><div class="span-4 box last"><strong>Sponsor happy hour (Sponsored by Red Hat)</strong><br /></div>
 
+<div class="span-2">18:00-20:00</div><div class="span-4 box last"><strong>BBQ & Band (Sponsored by Chef)</strong><br /></div>
 
 </div>
 
 
 <div class="span-7 append-bottom border">
 
 <div class="span-7 last">
-<h4>Day 2</h4>
+<h4>1 July - Friday</h4>
 </div>
 
 <div class="span-2">08:00-09:00</div><div class="span-4 box last"> Registration, Breakfast, and Sponsor Booths Open</div>
 <div class="span-2">09:00-9:15</div><div class="span-4 box last"><strong></strong>Opening Welcome</div>
 <div class="span-2">09:15-09:45</div><div class="span-4 box last">
+<a href="/events/2016-amsterdam/program/ken-mugrage">Ken Mugrage (Thoughtworks) - What we’re learning about burnout and how a DevOps culture can help</a>
     <br />
 </div>
-<div class="span-2">09:45-09:55</div><div class="span-4 box last">
+<div class="span-2">09:45-10:00</div><div class="span-4 box last">
   Sponsors
 </div>
-<div class="span-2">09:55-10:25</div><div class="span-4 box last">
+<div class="span-2">10:00-10:30</div><div class="span-4 box last">
+<a href="/events/2016-amsterdam/program/victoria-jeffrey">Victoria Jeffrey (Chef) - Preparing for the Day After Tomorrow - Test-Driven Infrastructure</a>
     <br />
 
 </div>
-<div class="span-2">10:25-10:40</div><div class="span-4 box last">
+<div class="span-2">10:30-10:45</div><div class="span-4 box last">
   Break
 </div>
 
-<div class="span-2">10:40-11:10</div><div class="span-4 box last" style="height:100px;">
+<div class="span-2">10:45-11:15</div><div class="span-4 box last">
+<a href="/events/2016-amsterdam/program/jeffrey-snover">Jeffrey Snover (Microsoft) - Rearchitecting Windows Server for DevOps</a>
     <br />
 </div>
 
-<div class="span-2">11:10-11:20</div><div class="span-4 box last">
+<div class="span-2">11:15-11:30</div><div class="span-4 box last">
   Sponsors
 </div>
 
-<div class="span-2">11:20-11:50</div><div class="span-4 box last">
+<div class="span-2">11:30-12:00</div><div class="span-4 box last">
+<a href="/events/2016-amsterdam/program/harim-weites">Harim Weites (Wehkamp) - One engineer, four environments, no termination protection.</a>
     <br />
 </div>
 
 <div class="span-2">11:50-13:00</div><div class="span-4 append-bottom last">Lunch (catered)</div>
 
-<div class="span-2">13:00-13:30</div><div class="span-4 box last"><strong>Ignites</strong> <br />
-
-</div>
+<div class="span-2">13:00-14:00</div><div class="span-4 box last"><strong>Open Space</strong> (Open Space) <br /> Sponsor Raffle & Open Space Opening</div>
 
-<div class="span-2">13:30-14:00</div><div class="span-4 box last"><strong>Open Space</strong> (Open Space) <br /> Open Space Opening</div>
+<div class="span-2">14:00-14:45</div><div class="span-4 box last"><strong>attendee-suggested <a href="/pages/open-space-format">Open Space</a> breakout discussions</strong> Open Space #1</div>
 
-<div class="span-2">14:00-14:45</div><div class="span-4 box last"><strong>Open Space</strong> (Open Space) <br /> Open Space #1</div>
+<div class="span-2">14:45-15:00</div><div class="span-4 box last"><strong>Break</strong> <br /> </div>
 
-<div class="span-2">15:00-15:45</div><div class="span-4 box last"><strong>Open Space</strong> (Open Space) <br /> Open Space #2</div>
+<div class="span-2">15:00-15:45</div><div class="span-4 box last"><strong>attendee-suggested <a href="/pages/open-space-format">Open Space</a> breakout discussions</strong> Open Space #2</div>
 
-<div class="span-2">16:00-16:45</div><div class="span-4 box last"><strong>Open Space</strong> (Open Space) <br /> Open Space #3</div>
+<div class="span-2">15:45-16:30</div><div class="span-4 box last"><strong>attendee-suggested <a href="/pages/open-space-format">Open Space</a> breakout discussions</strong> Open Space #3</div>
 
-<div class="span-2">17:00</div><div class="span-4 box last"><strong></strong>Close Day & Farewell</div>
+<div class="span-2">16:30-16:45</div><div class="span-4 box last"><strong></strong>Closing</div>
 
 
 

diff --git a/content/events/2016-amsterdam/propose.md b/content/events/2016-amsterdam/propose.md
@@ -8,11 +8,5 @@ tags = ["amsterdam","amsterdam-2016"]
 +++
   {{< cfp_dates >}}
 
-<center>
-<b>Call for proposals opens <%= render(:partial => "/#{@eventhome}/_cfp_date_start") %>.</b><br>
-<b>Call for proposals closes <%= render(:partial => "/#{@eventhome}/_cfp_date_end") %>.</b><br>
-Selected proposals will be announced on <%= render(:partial => "/#{@eventhome}/_cfp_date_announce") %>.
-</center>
-<br>
 <hr>
 The call for proposals is closed. Thank you for the many submits we have received! We hope to finish the selection soon and inform you.