Merge remote-tracking branch 'upstream/master'

Conflicts:
	site/content/blog/2013/03/08/dod-paris-2013/index.txt

site/content/_upcoming.txt

@@ -1,10 +1,10 @@
-<div class="submenu" style="width:550px">
-<h3>
-<a href="/events/2013-newzealand/">New Zealand</a>&nbsp;-
-<a href="/events/2013-london/">London</a>&nbsp;-
-<a href="/events/2013-paris/">Paris</a>&nbsp;-
-<a href="/events/2013-austin/">Austin</a>&nbsp;-
-<a href="/events/2013-berlin/">Berlin</a>&nbsp;-
-<a href="/events/2013-downunder/">Downunder</a>&nbsp;
-</h3>
-</div>
+<div class="submenu" style="width:550px">
+<h3>
+<a href="/events/2013-london/">London</a>&nbsp;-
+<a href="/events/2013-paris/">Paris</a>&nbsp;-
+<a href="/events/2013-austin/">Austin</a>&nbsp;-
+<a href="/events/2013-berlin/">Berlin</a>&nbsp;-
+<a href="/events/2013-amsterdam/">Amsterdam</a>&nbsp;-
+<a href="/events/2013-downunder/">Downunder</a>&nbsp;
+</h3>
+</div>

site/content/blog/2013/03/08/dod-paris-2013/index.txt

@@ -15,7 +15,11 @@ blog post is a little late to the game, it's not yet too late for you to
 participate either as an attendee or a speaker.
 
 For those interested in attending, we're offering a 25% discount on tickets
+<<<<<<< HEAD
 through the end of this week (10 March 2013) - just use the "WELOVEDEVOPS" code
+=======
+through the end of this week (17 March 2013) - just use the "WELOVEDEVOPS" code
+>>>>>>> upstream/master
 and you're <a href="http://devopsdays.org/events/2013-paris/registration/">all set</a>.
 
 If you're more interested in speaking, the <a href="http://devopsdays.org/events/2013-paris/propose/">Call for Proposals</a> is still open

site/content/events/2013-amsterdam/_menu.txt

@@ -7,6 +7,7 @@ filter:    erb
 <a href="/<%= @eventhome %>/propose">propose</a>&nbsp;
 <a href="/<%= @eventhome %>/program">program</a>&nbsp;
 <a href="/<%= @eventhome %>/location">location</a>&nbsp;
+<a href="/<%= @eventhome %>/registration">register</a>&nbsp;
 <a href="/<%= @eventhome %>/sponsor">sponsor</a>&nbsp;
 <a href="/<%= @eventhome %>/contact">contact</a>&nbsp;
 

site/content/events/2013-amsterdam/_sponsors.txt

@@ -5,8 +5,6 @@ filter:    erb
 { :image => "schubergphilis.png", :name => "Schuberg Philis", :link => "http://www.schubergphilis.com/"},
 { :image => "xebialabs.png", :name => "XebiaLabs", :link => "http://www.xebialabs.com/"},
 { :image => "vxcompany.png", :name => "VX Company", :link => "http://www.vxcompany.nl/"},
-{ :image => "amazon.png", :name => "Amazon", :link => "http://www.amazon.com/"},
-{ :image => "bitbrains.png", :name => "Bitbrains", :link => "http://www.bitbrains.nl/"},
 ]%>
 
 <% if @gsponsors.empty?  %>
@@ -23,6 +21,8 @@ filter:    erb
 { :image => "wercker.png", :name => "Wercker", :link => "http://www.wercker.com/"},
 { :image => "info-nl.png", :name => "Info.nl", :link => "http://www.info.nl/"},
 { :image => "engineyard.png", :name => "Engine Yard", :link => "https://www.engineyard.com/"},
+{ :image => "codecentric.png", :name => "codecentric", :link => "http://www.codecentric.nl/"},
+{ :image => "citrix.png", :name => "Citrix", :link => "http://www.citrix.com/"},
 ]%>
 
 <% unless @ssponsors.empty?  %><h1>Silver sponsors</h1><% end %>

site/content/events/2013-amsterdam/index.html

@@ -17,7 +17,7 @@
   <br><br>
   <a href="propose">Call for proposals</a> is now open!
   <br>
- Registration will open shortly.
+ <a href="registration">Registration</a> is now open!
 </td>
 </tr>
 </table>

site/content/events/2013-amsterdam/proposals/DavidMytton_Growinganopsteamfrom1founder/index.txt

@@ -0,0 +1,24 @@
+---
+extension: html
+filter:
+- erb
+- markdown
+dirty: true
+proposal: true
+talk: true
+selected: false
+layout: event
+author: David Mytton
+title: "Growing an ops team from 1 founder"
+---
+
+**Abstract:**
+
+Bootstrapped startups don't have the luxury of a full team of ops engineers available to respond to issues 24/7, so how can you survive on your own? This talk will tell the story of how to run your infrastructure as a single founder through to growing that into a team of on call engineers. It will include some interesting war stories as well as tips and suggestions for how to run ops at a startup.
+
+**Speaker:**
+
+David Mytton is the founder of server monitoring tool, Server Density, where he has been using MongoDB in production for almost 4 years. He has been programming in PHP and Python for over 10 years, regularly speaks about MongoDB (including starting the London MongoDB User Group), co-founded the Open Rights Group and can often be found cycling in London or drinking tea in Japan.
+--
+David Mytton
+http://www.serverdensity.com

site/content/events/2013-amsterdam/proposals/DavidMytton_OnHumansandDevOps/index.txt

@@ -0,0 +1,26 @@
+---
+extension: html
+filter:
+- erb
+- markdown
+dirty: true
+proposal: true
+talk: true
+selected: false
+layout: event
+author: David Mytton
+title: "On Humans and DevOps"
+---
+
+**Abstract:**
+
+Given the sysadmin stereotype, it's sometimes easy to forget that not everyone is up at 3am and ready to respond to alerts on a Friday night. In all but the most critical high availability environments, most teams will not have someone actively monitoring graphs 24/7. This means you have to deal with on-call schedules, technical handoffs, documentation, procedure manuals and trying to ensure mistakes aren't made, even in the middle of the night.
+
+This talk will look at how to approach the social aspects of running an ops team in terms of the human impact as well as using automation and tools.
+
+**Speaker:**
+
+David Mytton is the founder of server monitoring tool, Server Density, where he has been using MongoDB in production for almost 4 years. He has been programming in PHP and Python for over 10 years, regularly speaks about MongoDB (including starting the London MongoDB User Group), co-founded the Open Rights Group and can often be found cycling in London or drinking tea in Japan.
+
+David Mytton
+http://www.serverdensity.com

site/content/events/2013-amsterdam/registration/index.html

@@ -8,4 +8,9 @@
 layout : event
 title: registration
 ---
-<h4>Registration will open as soon as we've settled for a date and location</h4>
+<div style="width:100%; text-align:left;">
+    <iframe src="http://www.eventbrite.com/event/5362383032?ref=eweb" frameborder="0" height="10000" width="100%" vspace="0" hspace="0" marginheight="5" marginwidth="5" scrolling="auto" allowtran sparency="true"></iframe>
+    <div style="font-family:Helvetica, Arial; font-size:10px; padding:5px 0 5px; margin:2px; width:100%; text-align:left;" ><a style="color:#ddd; text-decoration:none;" target="_blank" href="http://www.eventbrite.com/r/eweb" >Online Ticketing</a><span style="color:#ddd;" > for </span><a style="color:#ddd; text-decoration:none;" target="_blank" href="http://www.eventbrite.com/event/5362383032?ref=eweb" >DevOpsDays Amsterdam 2013</a><span style="color:#ddd;" > powered by </span><a style="color:#ddd; text-decoration:none;" target="_blank" href="http://www.eventbrite.com?ref=eweb" >Eventbrite</a></div>
+</div></div>
+</div>
+

site/content/events/2013-amsterdam/sponsor/index.html

@@ -21,8 +21,20 @@ <h4>Note: Sponsorship packages are not yet finalized</h4>
 <tr><th><i>Packages</i></th><th><center><b><u>Silver</u></center></b></th><th><center><b><u>Gold</u></b></center></th></tr>
   <tr><td></td><td>
       <! // Silver paypal button here ->
+      <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+        <input type="hidden" name="cmd" value="_s-xclick">
+        <input type="hidden" name="hosted_button_id" value="CXBCDB42EAC3Y">
+        <input type="image" src="https://www.paypalobjects.com/nl_NL/NL/i/btn/btn_buynowCC_LG.gif" border="0" name="submit" alt="PayPal, de veilige en complete manier van online betalen.">
+        <img alt="" border="0" src="https://www.paypalobjects.com/nl_NL/i/scr/pixel.gif" width="1" height="1">
+      </form>
 </td><td>
       <! // Gold paypal button here ->
+      <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+         <input type="hidden" name="cmd" value="_s-xclick">
+         <input type="hidden" name="hosted_button_id" value="RUA6VGCUP3NGQ">
+         <input type="image" src="https://www.paypalobjects.com/nl_NL/NL/i/btn/btn_buynowCC_LG.gif" border="0" name="submit" alt="PayPal, de veilige en complete manier van online betalen.">
+         <img alt="" border="0" src="https://www.paypalobjects.com/nl_NL/i/scr/pixel.gif" width="1" height="1">
+      </form>
 </td></tr>
 
 <tr><td>Logo on website</td><td bgcolor="green">&nbsp;</td><td bgcolor="green">&nbsp;</td></tr>

site/content/events/2013-austin/_sponsors.txt

@@ -3,7 +3,7 @@ filter:    erb
 ---
 <% @psponsors = [
 { :image => "bmc.png", :name => "BMC", :link => "http://www.bmc.com/"},
-{ :image => "hp.png", :name => "HP", :link => "http://www.hp.com/"},
+{ :image => "hp.png", :name => "HP", :link => "http://www8.hp.com/us/en/software-solutions/software.html?compURI=1234839&jumpid=reg_r1002_usen_c-001_title_r0001"},
 { :image => "opscode.png", :name => "Opscode", :link => "http://opscode.com/"},
 { :image => "datadog.png", :name => "Datadog HQ", :link => "http://www.datadoghq.com/"},
 { :image => "puppetlabs.png", :name => "Puppetlabs", :link => "http://www.puppetlabs.com/"},
@@ -13,7 +13,7 @@ filter:    erb
 { :image => "collabnet.png", :name => "Collabnet", :link => "http://www.collabnet.com/"},
 ]%>
 
-<% @psponsors.each do |sponsor| %> <a href='<%= sponsor[:link] %>'><img border=0 alt='<%= sponsor[:name] %>' title='<%= sponsor[:name] %>' width=100px height=100px src='<%= File.join('/',@eventhome,"logos/#{sponsor[:image]}")%>'></a><% end %>
+<% @psponsors.shuffle.each do |sponsor| %> <a href='<%= sponsor[:link] %>'><img border=0 alt='<%= sponsor[:name] %>' title='<%= sponsor[:name] %>' width=100px height=100px src='<%= File.join('/',@eventhome,"logos/#{sponsor[:image]}")%>'></a><% end %>
 
 <% @gsponsors = [
 { :image => "serena.png", :name => "Serena", :link => "http://www.serena.com/"},
@@ -24,8 +24,9 @@ filter:    erb
 { :image => "stackdriver.png", :name => "Stackdriver", :link => "http://www.stackdriver.com/"},
 { :image => "rackspace.png", :name => "Rackspace", :link => "http://www.rackspace.com/cloud"},
 { :image => "newiron.png", :name => "New Iron", :link => "http://www.newiron.com"},
-{ :image => "whalesharkmedia.png", :name => "New Iron", :link => "http://www.whalesharkmedia.com"},
-{ :image => "bazaarvoice.png", :name => "New Iron", :link => "http://www.bazaarvoice.com"}
+{ :image => "whalesharkmedia.png", :name => "WhaleShark Media", :link => "http://www.whalesharkmedia.com"},
+{ :image => "bazaarvoice.png", :name => "Bazaarvoice", :link => "http://www.bazaarvoice.com"},
+{ :image => "appdynamics.png", :name => "AppDynamics", :link => "http://www.appdynamics.com"}
 ]%>
 
 <h1>Gold sponsors</h1>
@@ -63,4 +64,4 @@ filter:    erb
 <% @msponsors.each do |sponsor| %>
 <a href='<%= sponsor[:link] %>'><img border=0 alt='<%= sponsor[:name] %>' title='<%= sponsor[:name] %>' width=100px height=100px src='<%= File.join('/',@eventhome,"logos/#{sponsor[:image]}")%>'></a>
 <% end %>
-<br />
+<br />

site/content/events/2013-austin/proposals/Make a SOLID Software Architecture/index.txt

@@ -0,0 +1,29 @@
+---
+extension: html
+filter:
+- erb
+- markdown
+dirty: true
+proposal: true
+talk: true
+selected: false
+layout: event
+author: Ole Michaelis / Soenke Ruempler
+title: "Make it SOLID - Software Architecture for System Administrators"
+---
+
+**Abstract:**
+
+Starting with Chef or Puppet as a System Administrator will lead you
+to a problem where you are not sure what’s the best solution of a
+problem in terms of software architecture.
+
+We will give you a brief overview of general well known and battle
+tested software patterns which also applies to infrastructure
+management code. We’ll also show Antipatterns and best practices.
+
+**Speakers:**
+
+Ole Michaelis - <a href="https://twitter.com/codestars">https://twitter.com/codestars</a><br/>
+Soenke Ruempler - <a href="https://twitter.com/s0enke">https://twitter.com/s0enke</a>
+

site/content/events/2013-austin/propose/index.html

@@ -22,6 +22,8 @@
 
 ### Even if you don't propose, please consider [commenting on proposals submitted by others](../proposals/)
 
+If your proposal is accepted, you will receive free entry to the event.
+
 Our main criteria to make it to the top selection are:
 
 - _original content_: content not yet presented at other conferences, or a new angle to an existing problem

site/content/events/2013-austin/sponsor/index.html

@@ -30,12 +30,7 @@
         </form>
   </td><td>
         <! // Gold paypal button here ->
-        <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-          <input type="hidden" name="cmd" value="_s-xclick">
-          <input type="hidden" name="hosted_button_id" value="9PXKR3DEWWTF8">
-          <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_paynow_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
-          <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
-        </form>
+        <center><b><u>Sold Out!</u></b></center>
   </td></tr>
 
 <tr><td>2 included tickets</td><td bgcolor="green">&nbsp;</td><td bgcolor="green">&nbsp;</td></tr>
@@ -55,12 +50,7 @@
   <tr><td></td>
     <td>
           <! // Happy Hour paypal button here ->
-          <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-            <input type="hidden" name="cmd" value="_s-xclick">
-            <input type="hidden" name="hosted_button_id" value="5WRS3XYQ4WZ8W">
-            <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_paynow_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
-            <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
-          </form>
+          <center><b><u>Sold Out!</u></b></center>
     </td>
 <td>
         <! // Speaker's Dinner paypal button here ->

site/content/events/2013-barcelona/_sponsors.txt

@@ -5,11 +5,9 @@ filter:    erb
 <% @psponsors = [
 { :image => "datadog.png", :name => "Datadog HQ", :link => "http://www.datadoghq.com/"},
 { :image => "opscode.png", :name => "Opscode", :link => "http://opscode.com/"},
-{ :image => "collabnet.png", :name => "Collabnet", :link => "http://www.collabnet.com/"},
-{ :image => "puppetlabs.png", :name => "Puppetlabs", :link => "http://www.puppetlabs.com/"},
 { :image => "bmc.png", :name => "BMC", :link => "http://www.bmc.com/"},
 { :image => "urbancode.png", :name => "Urbancode", :link => "http://www.urbancode.com/"},
-{ :image => "hp.png", :name => "HP", :link => "http://www.hp.com/"},
+{ :image => "hp.png", :name => "HP", :link => "http://www8.hp.com/us/en/software-solutions/software.html?compURI=1234839&jumpid=reg_r1002_usen_c-001_title_r0001"},
 { :image => "uc4.png", :name => "UC4", :link => "http://www.uc4.com/ara"},
 ]%>
 

site/content/events/2013-berlin/_sponsors.txt

@@ -1,8 +1,17 @@
 ---
 filter:    erb
 ---
-<% @gsponsors = [
+<% @psponsors = [
   { :image => "zeroturnaround.png", :name => "Zeroturnaround", :link => "http://www.zeroturnaround.com"},
+  { :image => "hp.png", :name => "HP", :link => "http://www8.hp.com/de/de/software-solutions/software.html?compURI=1234839&jumpid=reg_r1002_dede_c-001_title_r0001"},
+]%>
+
+<% @psponsors.each do |sponsor| %>
+<a href='<%= sponsor[:link] %>'><img border=0 alt='<%= sponsor[:name] %>' title='<%= sponsor[:name] %>' width=100px height=100px src='<%= File.join('/',@eventhome,"logos/#{sponsor[:image]}")%>'></a>
+<% end %>
+
+<h1>Gold Sponsors</h1>
+<% @gsponsors = [
   { :image => "gutefrage.png", :name => "Gutefrage", :link => "http://www.gutefrage.net/"},
   { :image => "immobilienscout.png", :name => "Immobilien Scout", :link => "http://developer.immobilienscout24.de/2012/10/jobs-kein-kalter-kaffee/"},
   { :image => "unbelievablemachine.png", :name => "The unbelievable Machine Company", :link => "http://www.unbelievable-machine.com"},

site/content/events/2013-berlin/contact/index.html

@@ -6,6 +6,7 @@
 title: contact
 dirty: true
 layout: event
+platinum: true
 ---
 <% @eventhome = @page.directory.split(File::SEPARATOR)[0..1].join(File::SEPARATOR) %> 
 <% @eventid = File.basename(@page.directory) %>

site/content/events/2013-berlin/index.html

@@ -6,7 +6,7 @@
 - markdown
 title: welcome
 dirty: true
-platinum: false
+platinum: true
 ---
 <% @eventhome = @page.directory.split(File::SEPARATOR)[0..1].join(File::SEPARATOR) %>
 <center>

site/content/events/2013-berlin/location/index.html

@@ -6,6 +6,7 @@
 title: location
 layout: event
 dirty: true
+platinum: true
 ---
 
 ### Conference Location

site/content/events/2013-berlin/program/index.html

@@ -6,6 +6,7 @@
 title: program
 dirty: true
 layout: event
+platinum: true
 ---
 <% @eventhome = @page.directory.split(File::SEPARATOR)[0..1].join(File::SEPARATOR) %>
 <hr>

site/content/events/2013-berlin/proposals/Make a SOLID Software Architecture/index.txt

@@ -0,0 +1,29 @@
+---
+extension: html
+filter:
+- erb
+- markdown
+dirty: true
+proposal: true
+talk: true
+selected: false
+layout: event
+author: Ole Michaelis / Soenke Ruempler
+title: "Make it SOLID - Software Architecture for System Administrators"
+---
+
+**Abstract:**
+
+Starting with Chef or Puppet as a System Administrator will lead you
+to a problem where you are not sure what’s the best solution of a
+problem in terms of software architecture.
+
+We will give you a brief overview of general well known and battle
+tested software patterns which also applies to infrastructure
+management code. We’ll also show Antipatterns and best practices.
+
+**Speakers:**
+
+Ole Michaelis - <a href="https://twitter.com/codestars">https://twitter.com/codestars</a><br/>
+Soenke Ruempler - <a href="https://twitter.com/s0enke">https://twitter.com/s0enke</a>
+

site/content/events/2013-berlin/proposals/Ops Around The World/index.txt

@@ -0,0 +1,23 @@
+---
+extension: html
+filter:
+- erb
+- markdown
+dirty: true
+proposal: true
+talk: true
+selected: false
+layout: event
+author: David Mytton
+title: "Ops Around the World"
+---
+
+**Abstract:**
+
+In the old days, data centre selection was based on proximity to a data centre and when things went wrong part of the recovery time calculations included how long it would take to drive there. Now you can deploy servers in almost every continent in a few minutes.
+
+This talk will examine the challenges of geographically diverse deployments. From technical concerns like latency, deployment lead times and systems management to social issues like on-call rotations, follow the Sun provisioning and trusting your data centre techs.
+
+**Speaker:**
+
+David Mytton is the founder of server monitoring tool, Server Density, where he has been using MongoDB in production for almost 4 years. He has been programming in PHP and Python for over 10 years, regularly speaks about MongoDB (including starting the London MongoDB User Group), co-founded the Open Rights Group and can often be found cycling in London or drinking tea in Japan.