Merge branch '7341-deploy-retries-puppet-agent-wip'
authorBrett Smith <brett@curoverse.com>
Thu, 15 Oct 2015 15:57:43 +0000 (11:57 -0400)
committerBrett Smith <brett@curoverse.com>
Thu, 15 Oct 2015 15:57:43 +0000 (11:57 -0400)
Closes #7341, #7549.


Trivial merge