diff --git a/content/events/2016-amsterdam/program.md b/content/events/2016-amsterdam/program.md index 6078adb995d..2bc64671dac 100644 --- a/content/events/2016-amsterdam/program.md +++ b/content/events/2016-amsterdam/program.md @@ -196,15 +196,16 @@ tags = ["amsterdam","amsterdam-2016"]
11:50-13:00
Lunch (catered)
-
13:00-13:40
+
13:00-13:45
Ignites
Will Button (Trax) - An ElasticSearch Cluster Named George Armstrong Custer
+ Bernd Erk - Working in and with Open Source Communities
Hannah Foxwell (Pendrica) - Systems are Simple. Humans are Complex.
Gopal Ramachandran (TMNS) - Test driven Dockerized infrastructure
Marco Ceppi - Open Source Operations - punching up
-
13:40-14:30
+
13:45-14:30
Open Space
Open Space Opening
diff --git a/content/events/2016-amsterdam/program/bernd-erk.md b/content/events/2016-amsterdam/program/bernd-erk.md new file mode 100644 index 00000000000..a190d2aa79f --- /dev/null +++ b/content/events/2016-amsterdam/program/bernd-erk.md @@ -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/"] + ++++ + +
+
+

Title: +Working in and with Open Source Communities +

+ +

Description:

+ +

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.

+ +

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.

+ +
+
diff --git a/content/events/2016-amsterdam/workshops.md b/content/events/2016-amsterdam/workshops.md index 50d6a69f27e..22c7333314e 100644 --- a/content/events/2016-amsterdam/workshops.md +++ b/content/events/2016-amsterdam/workshops.md @@ -78,7 +78,7 @@ tags = ["amsterdam","amsterdam-2016"]
Christoph Andreas Torlinsky (Nuage Networks)
A Place for SDN in DevOps
Dave van Herpen & Robert den Broeder (Sogeti)
Creating high-performance teams with DevOps behavior
Remi Bergsma & Fred Neubauer (Schuberg Philis)
Cloudstack / Cosmic Cloud
-
Stefan Stölzle (Github)
Implementing a CI and CD Pipeline with GitHub
+
Stefan Stölzle (Github)
Implementing a CI and CD Pipeline with GitHub

11:30 - 12:00 Fast Lunch (Catered)

diff --git a/content/events/2016-amsterdam/workshops/andrew-farley.md b/content/events/2016-amsterdam/workshops/andrew-farley.md index c24702cb66f..454a3f840f9 100644 --- a/content/events/2016-amsterdam/workshops/andrew-farley.md +++ b/content/events/2016-amsterdam/workshops/andrew-farley.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/arnold-van-wijnbergen.md b/content/events/2016-amsterdam/workshops/arnold-van-wijnbergen.md index 159cf82a78b..6d7152b2512 100644 --- a/content/events/2016-amsterdam/workshops/arnold-van-wijnbergen.md +++ b/content/events/2016-amsterdam/workshops/arnold-van-wijnbergen.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/bas-meijer.md b/content/events/2016-amsterdam/workshops/bas-meijer.md index 7e51faa9552..9d0f0988187 100644 --- a/content/events/2016-amsterdam/workshops/bas-meijer.md +++ b/content/events/2016-amsterdam/workshops/bas-meijer.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/christoph-andreas-torlinsky.md b/content/events/2016-amsterdam/workshops/christoph-andreas-torlinsky.md index 479afb48d50..cb422472bd5 100644 --- a/content/events/2016-amsterdam/workshops/christoph-andreas-torlinsky.md +++ b/content/events/2016-amsterdam/workshops/christoph-andreas-torlinsky.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/dave-van-herpen.md b/content/events/2016-amsterdam/workshops/dave-van-herpen.md index a1dd9f8643e..4e5107d8ff8 100644 --- a/content/events/2016-amsterdam/workshops/dave-van-herpen.md +++ b/content/events/2016-amsterdam/workshops/dave-van-herpen.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/jim-leitch.md b/content/events/2016-amsterdam/workshops/jim-leitch.md index 26c8f9b24a0..4678103d798 100644 --- a/content/events/2016-amsterdam/workshops/jim-leitch.md +++ b/content/events/2016-amsterdam/workshops/jim-leitch.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/karleen-wijsman.md b/content/events/2016-amsterdam/workshops/karleen-wijsman.md index c7b3d6ff5ad..7dcf7aff617 100644 --- a/content/events/2016-amsterdam/workshops/karleen-wijsman.md +++ b/content/events/2016-amsterdam/workshops/karleen-wijsman.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/michael-ducy.md b/content/events/2016-amsterdam/workshops/michael-ducy.md index 66c14cd0c4a..e69152ec5aa 100644 --- a/content/events/2016-amsterdam/workshops/michael-ducy.md +++ b/content/events/2016-amsterdam/workshops/michael-ducy.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/michael-friedrich.md b/content/events/2016-amsterdam/workshops/michael-friedrich.md index 0ee851f73ae..dbf865ebaa8 100644 --- a/content/events/2016-amsterdam/workshops/michael-friedrich.md +++ b/content/events/2016-amsterdam/workshops/michael-friedrich.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/nati-cohen.md b/content/events/2016-amsterdam/workshops/nati-cohen.md index bdecafa6457..4258c5b5e77 100644 --- a/content/events/2016-amsterdam/workshops/nati-cohen.md +++ b/content/events/2016-amsterdam/workshops/nati-cohen.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/philipp-krenn.md b/content/events/2016-amsterdam/workshops/philipp-krenn.md index f22603f752d..21821949b69 100644 --- a/content/events/2016-amsterdam/workshops/philipp-krenn.md +++ b/content/events/2016-amsterdam/workshops/philipp-krenn.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/remi-bergsma.md b/content/events/2016-amsterdam/workshops/remi-bergsma.md index 4c59c0a835c..cad5eb13e0d 100644 --- a/content/events/2016-amsterdam/workshops/remi-bergsma.md +++ b/content/events/2016-amsterdam/workshops/remi-bergsma.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/simon-fisher.md b/content/events/2016-amsterdam/workshops/simon-fisher.md index d5514786cd7..dfaea270d30 100644 --- a/content/events/2016-amsterdam/workshops/simon-fisher.md +++ b/content/events/2016-amsterdam/workshops/simon-fisher.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/stefan-stolze.md b/content/events/2016-amsterdam/workshops/stefan-stolzle.md similarity index 96% rename from content/events/2016-amsterdam/workshops/stefan-stolze.md rename to content/events/2016-amsterdam/workshops/stefan-stolzle.md index bfb08522f12..9b7eb9d51f5 100644 --- a/content/events/2016-amsterdam/workshops/stefan-stolze.md +++ b/content/events/2016-amsterdam/workshops/stefan-stolzle.md @@ -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/"] +++ diff --git a/content/events/2016-amsterdam/workshops/tiziano-perrucci.md b/content/events/2016-amsterdam/workshops/tiziano-perrucci.md index 034e9cb9683..51fb4e0f6b1 100644 --- a/content/events/2016-amsterdam/workshops/tiziano-perrucci.md +++ b/content/events/2016-amsterdam/workshops/tiziano-perrucci.md @@ -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/"] +++ diff --git a/data/events/2016-amsterdam.yml b/data/events/2016-amsterdam.yml index e550069ae91..935de66c0ec 100644 --- a/data/events/2016-amsterdam.yml +++ b/data/events/2016-amsterdam.yml @@ -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 diff --git a/data/speakers/2016/amsterdam/bernd-erk.yml b/data/speakers/2016/amsterdam/bernd-erk.yml new file mode 100644 index 00000000000..88a6e8cb949 --- /dev/null +++ b/data/speakers/2016/amsterdam/bernd-erk.yml @@ -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." diff --git a/data/speakers/2016/amsterdam/stefan-stolze.yml b/data/speakers/2016/amsterdam/stefan-stolzle.yml similarity index 100% rename from data/speakers/2016/amsterdam/stefan-stolze.yml rename to data/speakers/2016/amsterdam/stefan-stolzle.yml diff --git a/static/events/2016-amsterdam/speakers/bernd-erk.png b/static/events/2016-amsterdam/speakers/bernd-erk.png new file mode 100644 index 00000000000..30ce9e84c7e Binary files /dev/null and b/static/events/2016-amsterdam/speakers/bernd-erk.png differ diff --git a/static/events/2016-amsterdam/speakers/stefan-stolze.png b/static/events/2016-amsterdam/speakers/stefan-stolze.png deleted file mode 100644 index 6d0aad7835f..00000000000 Binary files a/static/events/2016-amsterdam/speakers/stefan-stolze.png and /dev/null differ