Merge commit

Author: mattstratton

exampleSite/content/blog/2016-chicago.md

@@ -5,7 +5,6 @@ Tags = []
 date = "2016-12-12T16:31:00-06:00"
 title = "Chicago 2016 in review"
 Author = "Matt Stratton"
-sharing_image = "img/your-mom.jpg"
 
 +++
 

exampleSite/content/blog/2016-kansas_city.md

@@ -5,7 +5,6 @@ Tags = ["2016"]
 date = "2017-03-21T16:31:00-06:00"
 title = "Kansas City 2016 in review"
 Author = "Aaron Blythe"
-sharing_image = ""
 
 +++
 
@@ -15,9 +14,9 @@ You can check out a recap here:
 
 <iframe width="420" height="315"
 src="https://www.youtube.com/embed/dyOaK7N0qf4">
-</iframe>
+</iframe> 
 
-The conference was a mixture of presentations and open spaces. Speakers came from both coasts and included viewpoints ranging from a high school student to a PhD, from seasoned executives to software and system engineers, from first time presenters to presenters with over 60 conferences speaking slots. Open spaces were held in the afternoon. This is where the conference takes a turn from organized formal content to informal self-organizing content. Attendees suggested topics and voted throughout the day. They then voted with their feet throughout the afternoon by moving from the 5 simultaneous discussions.
+The conference was a mixture of presentations and open spaces. Speakers came from both coasts and included viewpoints ranging from a high school student to a PhD, from seasoned executives to software and system engineers, from first time presenters to presenters with over 60 conferences speaking slots. Open spaces were held in the afternoon. This is where the conference takes a turn from organized formal content to informal self-organizing content. Attendees suggested topics and voted throughout the day. They then voted with their feet throughout the afternoon by moving from the 5 simultaneous discussions. 
 
 The [videos](https://confreaks.tv/events/devopsdayskansascity2016) and [slides](https://www.devopsdays.org/events/2016-kansascity/program/) of all talks are linked on our [program](https://www.devopsdays.org/events/2016-kansascity/program/).
 
@@ -49,3 +48,4 @@ Bert Weidt, CJ Obermaier, Chris Stein (back), Dan Barker, Tom Martin, Chase Pett
 </div>
 
 </div>
+

exampleSite/content/events/2017-amsterdam/program.md

@@ -159,7 +159,7 @@ heading = "devopsdays Amsterdam - Program"
   </div>
   <div class = "col-md-3 col-md-offset-2 box-grey">
     <strong>HumanOps Track</strong><br />
-    <a href="/events/2017-amsterdam/program/talk-to-be-confirmed/">Talk to be confirmed</a>
+    <a href="/events/2017-amsterdam/program/david-mytton/">David Mytton - How to do HumanOps</a>
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->

exampleSite/content/events/2017-amsterdam/program/david-mytton.md

@@ -0,0 +1,10 @@
++++
+Talk_date = ""
+Talk_start_time = ""
+Talk_end_time = ""
+Title = "How to do HumanOps"
+Type = "talk"
+Speakers = ["david-mytton"]
++++
+
+HumanOps is all about designing systems with the human operators in mind. This talk will examine the 12 principles of HumanOps and explain how you can implement them in your own organisation.

exampleSite/content/events/2017-amsterdam/speakers.md

@@ -1,8 +1,5 @@
 +++
-date = "2016-04-15T00:00:00-00:00"
-heading = "devopsdays Amsterdam - Speakers"
-title = "speakers"
-type = "speakers"
+Title = "Speakers"
+Type = "speakers"
 Description = "Speakers for devopsdays Amsterdam 2017"
-
 +++

exampleSite/content/events/2017-amsterdam/speakers/andy-repton.md

@@ -0,0 +1,10 @@
++++
+Title = "Andy Repton"
+Twitter = "sethkarlo"
+Linkedin = "https://www.linkedin.com/in/andy-repton-bb661337/"
+image = "andy-repton.jpg"
+type = "speaker"
+linktitle = "andy-repton"
++++
+
+Andy Repton is a Mission Critical Engineer at Schuberg Philis. A keen learner, he uses innovative open source technologies to design solutions to all sorts of challenges, ranging from running genomics pipelines to microservices web portals to financial development environments. When he’s not working or speaking at events, you’ll usually find Andy in the streets of a far off country with a bag on his back, taking pictures and eating strange foods. He is currently focusing on implementations of Mission Critical Kubernetes.

exampleSite/content/events/2017-amsterdam/speakers/david-mytton.md

@@ -0,0 +1,10 @@
++++
+Title = "David Mytton"
+Twitter = "davidmytton"
+image = "david-mytton.jpg"
+type = "speaker"
+linktitle = "david-mytton"
+
++++
+
+David Mytton is founder and CEO of Server Density, a scalable infrastructure monitoring software company. Server Density has more than 700 customers, including the NHS, Drupal, Firebox and Greenpeace, and started the HumanOps community based around its own experience of on-call.

exampleSite/content/events/2017-amsterdam/speakers/samuel-terburg.md

@@ -0,0 +1,10 @@
++++ 
+Title = "Samuel Terburg" 
+Twitter = "SamuelTerburg" 
+linkedin = "https://www.linkedin.com/in/samuelterburg/" 
+image = "samuel-terburg.jpg" 
+type = "speaker" 
+linktitle = "samuel-terburg" 
++++
+
+Samuel Terburg is  Cloud Architect specializing in DevOps, CI/ CD & Docker containers. Samuel worked on a daily basis on the establishment of CI / CD environments based on Jenkins & Docker container technology. 

exampleSite/content/events/2017-amsterdam/workshop.md

@@ -97,9 +97,9 @@ tags = ["amsterdam","amsterdam-2017"]
 </div>
 <div class = "row">
   <div class = "col-md-3 box">
-    <a href="/events/2017-amsterdam/workshop/vishal-biyani/">
+    <a href="/events/2017-amsterdam/workshop/andy-repton/">
     <strong>Introduction to Kubernetes</strong><br />
-    Vishal Biyani
+    Andy Repton
   </a>
   </div>
   <div class = "col-md-3 box-grey">
@@ -162,7 +162,7 @@ tags = ["amsterdam","amsterdam-2017"]
   <div class = "col-md-3 box">
     <a href="/events/2017-amsterdam/workshop/alessandro-vozza/">
     <strong>Hands-on Openshift Developer Workshop (in Azure)</strong><br />
-    Alessandro Vozza
+    Alessandro Vozza & Samuel Terburg
   </a>
   </div>
 </div>

exampleSite/content/events/2017-amsterdam/workshop/alessandro-vozza.md

@@ -1,8 +1,8 @@
 +++
 Title = "Hands-on Openshift Developer Workshop (in Azure)"
 Type = "workshop"
-Speakers = ["alessandro-vozza"]
-aliases = ["/events/2017-amsterdam/workshop/alessandro-vozza/"]
+Speakers = ["alessandro-vozza", "samuel-terburg"]
+aliases = ["/events/2017-amsterdam/workshop/alessandro-vozza/", "/events/2017-amsterdam/workshop/samuel-terburg/"]
 +++
 
 Openshift is the award-winning open source container orchestration platform built upon Kubernetes, and it's very popular in enterprises. We will guide you thru deploying your Openshift cluster and deploying your application on top of it.