2017-07-22 - puppet
10:45	<valhallasw`cloud>	ran git pull && git stash && git rebase origin/production on puppet-ema.puppet.eqiad.wmflabs && git stash apply on puppet-ema ; had to manually merge modules/base/manifests/kernel.pp	[puppet]