Skip to content

Commit

Permalink
Merge pull request #395 from yvovandoorn/yvandoorn/FixWorkshopAlias
Browse files Browse the repository at this point in the history
Program Improvements
  • Loading branch information
Yvo committed May 19, 2016
2 parents 32235c7 + 9524a15 commit 2334917
Show file tree
Hide file tree
Showing 23 changed files with 47 additions and 19 deletions.
5 changes: 3 additions & 2 deletions content/events/2016-amsterdam/program.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,16 @@ tags = ["amsterdam","amsterdam-2016"]

<div class="span-3 box-blue">11:50-13:00</div><div class="span-10 append-bottom box-blue">Lunch (catered)</div>

<div class="span-3 box-green">13:00-13:40</div>
<div class="span-3 box-green">13:00-13:45</div>
<div class="span-10 box-green last"><strong>Ignites</strong><br />
<a href="/events/2016-amsterdam/program/will-button">Will Button (Trax) - An ElasticSearch Cluster Named George Armstrong Custer</a><br />
<a href="/events/2016-amsterdam/program/bernd-erk">Bernd Erk - Working in and with Open Source Communities</a><br />
<a href="/events/2016-amsterdam/program/hannah-foxwell">Hannah Foxwell (Pendrica) - Systems are Simple. Humans are Complex.</a><br />
<a href="/events/2016-amsterdam/program/gopal-ramachandran">Gopal Ramachandran (TMNS) - Test driven Dockerized infrastructure</a><br />
<a href="/events/2016-amsterdam/program/marco-ceppi">Marco Ceppi - Open Source Operations - punching up</a><br />
</div>

<div class="span-3 box-coral">13:40-14:30</div>
<div class="span-3 box-coral">13:45-14:30</div>
<div class="span-10 box-coral last"><strong>Open Space</strong> <br />
Open Space Opening
</div>
Expand Down
24 changes: 24 additions & 0 deletions content/events/2016-amsterdam/program/bernd-erk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
+++
City = "Amsterdam"
Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Bernd Erk"
type = "talk"
aliases = ["/events/2016-amsterdam/program/bernderk/"]

+++

<div class="span-15 ">
<div class="span-15 last ">
<p><strong>Title:</strong>
Working in and with Open Source Communities
</p>

<p><strong>Description:</strong></p>

<p>Starting an open source project is very easy, especially in the days of GitHub. Push your code and see if somebody is interested in. If you are able to gain attention and interest for you project you feel motivated and work all night long. But on the other hand, people will start complaining about open bugs, missing features and your evil or non existing website. Believe it or not, but this will pursue you until your last user dies.</p>

<p>One of the most important things for a successful open source project is to treat you community well. This talk will share some experiences made during the last 6 years with Icinga. Starting with basic concepts, it deals with tools and methods helping to increase and cultivate your community. It also covers internal organisation requirements for successful community work and upcoming challenges if you strike some new paths with your project.</p>

</div>
</div>
2 changes: 1 addition & 1 deletion content/events/2016-amsterdam/workshops.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ tags = ["amsterdam","amsterdam-2016"]
<div class="box-gray span-15"><a href="/events/2016-amsterdam/workshops/christoph-andreas-torlinsky">Christoph Andreas Torlinsky (Nuage Networks) <br /> A Place for SDN in DevOps</a></div>
<div class="box-blue span-15"><a href="/events/2016-amsterdam/workshops/dave-van-herpen">Dave van Herpen & Robert den Broeder (Sogeti) <br /> Creating high-performance teams with DevOps behavior</a></div>
<div class="box-gray span-15"><a href="/events/2016-amsterdam/workshops/remi-bergsma">Remi Bergsma & Fred Neubauer (Schuberg Philis) <br /> Cloudstack / Cosmic Cloud</a></div>
<div class="box-blue span-15"><a href="/events/2016-amsterdam/workshops/stefan-stolze">Stefan Stölzle (Github) <br /> Implementing a CI and CD Pipeline with GitHub</a></div>
<div class="box-blue span-15"><a href="/events/2016-amsterdam/workshops/stefan-stolzle">Stefan Stölzle (Github) <br /> Implementing a CI and CD Pipeline with GitHub</a></div>
</div>

<div class="span-15 box-green centerstyle"><h4>11:30 - 12:00 Fast Lunch (Catered)</h4></div>
Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-amsterdam/workshops/andrew-farley.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Building Scalable Docker Services in Amazon’s Web Services with ECS"
type = "talk"
aliases = ["/events/2016-amsterdam/program/andrewfarley/"]
aliases = ["/events/2016-amsterdam/program/andrew-farley/"]

+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "First steps to create your IT Operations data lake with ELK Stack and Graphite"
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/arnoldvanwijnbergen/"]
aliases = ["/events/2016-amsterdam/program/arnold-van-wijnbergen/"]

+++

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-amsterdam/workshops/bas-meijer.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Ansible, best practices."
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/bas-meijer/"]
aliases = ["/events/2016-amsterdam/program/bas-meijer/"]

+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "A Place for SDN in DevOps"
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/christoph-andreas-torlinsky/"]
aliases = ["/events/2016-amsterdam/program/christoph-andreas-torlinsky/"]

+++

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-amsterdam/workshops/dave-van-herpen.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Creating high-performance teams with DevOps behavior"
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/dave-van-herpen/"]
aliases = ["/events/2016-amsterdam/program/dave-van-herpen/"]

+++

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-amsterdam/workshops/jim-leitch.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Like A Rhino in Your Kid Brother's White Tuxedo - Legacy and Awesome is not an Oxymoron"
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/jim-leitch/"]
aliases = ["/events/2016-amsterdam/program/jim-leitch/"]

+++

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-amsterdam/workshops/karleen-wijsman.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Appreciative Inquiry, the most enjoyable way of change."
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/karleen-wijsman/"]
aliases = ["/events/2016-amsterdam/program/karleen-wijsman/"]

+++

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-amsterdam/workshops/michael-ducy.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Test Driven Development With Chef"
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/michael-ducy/"]
aliases = ["/events/2016-amsterdam/program/michael-ducy/"]

+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Monitoring with Icinga 2"
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/michael-friedrich/"]
aliases = ["/events/2016-amsterdam/program/michael-friedrich/"]

+++

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-amsterdam/workshops/nati-cohen.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Docker From Scratch"
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/nati-cohen/"]
aliases = ["/events/2016-amsterdam/program/nati-cohen/"]

+++

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-amsterdam/workshops/philipp-krenn.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Going Elastic"
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/philipp-krenn/"]
aliases = ["/events/2016-amsterdam/program/philipp-krenn/"]

+++

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-amsterdam/workshops/remi-bergsma.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Cloudstack / Cosmic Cloud"
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/remi-bergsma/"]
aliases = ["/events/2016-amsterdam/program/remi-bergsma/"]

+++

Expand Down
2 changes: 1 addition & 1 deletion content/events/2016-amsterdam/workshops/simon-fisher.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Out with the old, in with the new – modernizing Rails application deployment with Chef"
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/simon-fisher/"]
aliases = ["/events/2016-amsterdam/program/simon-fisher/"]

+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Implementing a CI and CD Pipeline with GitHub"
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/stefan-stolze/"]
aliases = ["/events/2016-amsterdam/program/stefan-stolzle/"]

+++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Year = "2016"
date = "2016-03-06T21:28:07-06:00"
title = "Feature based continuous deployment"
type = "talk"
aliases = ["/events/2016-amsterdam/workshops/tiziano-perrucci/"]
aliases = ["/events/2016-amsterdam/program/tiziano-perrucci/"]

+++

Expand Down
2 changes: 1 addition & 1 deletion data/events/2016-amsterdam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ speakers:
level: talk
- id: "simon-fisher"
level: talk
- id: "stefan-stolze"
- id: "stefan-stolzle"
level: talk
- id: "tiziano-perrucci"
level: talk
Expand Down
3 changes: 3 additions & 0 deletions data/speakers/2016/amsterdam/bernd-erk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name: "Bernd Erk"
twitter: "gethash"
bio: "Bernd Erk is co-founder and community manager of the Icinga Project. In his day job he is CEO at NETWAYS, a German open source service company. As contributor to Linux Magazine and Admin Magazine, Bernd regularly publishes articles and presents on open source topics ranging from monitoring, configuration management to various open source datacenter solutions. He tries to spread the DevOps spirit wherever and whenever possible."
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.

0 comments on commit 2334917

Please sign in to comment.