From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 25 Oct 2012 17:54:39 +0000 (-0700)
Subject: Merge branch 'maint/2.5.x/pick_pr86_ensure_resource' into maint/2.5.x/pick_compatible... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=699d520e72014a3a17395c52c04f5b521d1318e6;p=puppet-stdlib.git

Merge branch 'maint/2.5.x/pick_pr86_ensure_resource' into maint/2.5.x/pick_compatible_new_functionality

* maint/2.5.x/pick_pr86_ensure_resource:
  re-formatting
  Add better docs about duplicate resource failures
  Handle undef for parameter argument
  Add function ensure_resource and defined_with_params
---

699d520e72014a3a17395c52c04f5b521d1318e6