From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 16 Aug 2012 17:41:23 +0000 (-0700)
Subject: Merge branch 'bodepd-ensure_resource_attempt_2'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1e9db532e61c8eee7937423f27a9215f318d6144;p=puppet-stdlib.git

Merge branch 'bodepd-ensure_resource_attempt_2'

* bodepd-ensure_resource_attempt_2:
  Explicitly load functions used by ensure_resource
  Revert "Revert "Merge pull request #86 from bodepd/ensure_resource""
---

1e9db532e61c8eee7937423f27a9215f318d6144