Permalink
Browse files

Make the talks appear, like magic

  • Loading branch information...
1 parent 6228e0b commit cc41d3a8b72f2f60c5825cea8326100edaa932b1 Arjen Wolfs committed Apr 11, 2013
View
3 ...ls/MartinEnglund_AmazontimetravelorhowtolivewithAWSeventualconsistencytimewarps/index.txt
@@ -23,15 +23,12 @@ Martin Englund is a Principal Engineer at Pivotal, where he works on BOSH - the
Martin has over twenty years of experience in security and automation, and has contributed to other automation tools, like Puppet. Prior to this role, he worked at Sun Microsystems as a Principal Security Engineer running Sun's external web presence, in Java Security Engineering and the Sun IT Security Office, where he was responsible for creating the standards and tools used by Sun IT to secure its servers. He has also authored numerous technical papers on security, including co-authoring the Solaris Security Essentials book.
-<<<<<<< HEAD
twitter: @pmenglund
-
blog: http://blog.codenursery.com/
linkedin: http://www.linkedin.com/in/pmenglund
=======
Twitter: @pmenglund
Blog: http://blog.codenursery.com/
Linkedin: http://www.linkedin.com/in/pmenglund
->>>>>>> a28361acdf4135ef4dd5d14c1f1b827524a09fea
View
1 ...roposals/NatiShalom_Buildingcrossregionandcrosscloudhighavailabilityintoyourapp/index.txt
@@ -5,6 +5,7 @@ filter:
- markdown
dirty: true
proposal: true
+talk: true
ignite: false
selected: false
layout: event
View
1 ...ts/2013-amsterdam/proposals/NatiShalom_ContinuousDeliverywithJenkinsandCloudify/index.txt
@@ -5,6 +5,7 @@ filter:
- markdown
dirty: true
proposal: true
+talk: true
ignite: false
selected: false
layout: event
View
1 ...ts/2013-amsterdam/proposals/UriCohen_BuildingyourownOpsWorkswithChefandCloudify/index.txt
@@ -5,6 +5,7 @@ filter:
- markdown
dirty: true
proposal: true
+talk: true
ignite: false
selected: false
layout: event
View
1 ..._TestingasaServiceHowweusedOpenStacktoautomateourentiredevandtestingenvironment/index.txt
@@ -5,6 +5,7 @@ filter:
- markdown
dirty: true
proposal: true
+talk: true
ignite: false
selected: false
layout: event

0 comments on commit cc41d3a

Please sign in to comment.