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)
commit51601a277992c213e60c6bebbc876631891ce699
tree2ecca16170bbec792650daf1b00fc2466a37a804
parentd3f13c19bdc7b2efe160c66116461faf865fed4e
parentf4d018c979b333d61fed9b1884d7edab540f3c1a
Merge branch '7341-deploy-retries-puppet-agent-wip'

Closes #7341, #7549.