2016-02-23 - production
22:45 <thcipriani> deployment-puppetmaster is in a weird rebase state [production]