2015-11-11 - releng
00:02	<thcipriani>	deployment-puppetmaster:/var/lib/git/operations/puppet was left mid-rebase conflicts with portals apache config. Fixed conflicts added the file and continued the rebase.	[releng]