]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch 'maint/2.5.x/pick_compatible_new_functionality' into 2.5.x
authorJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 17:58:27 +0000 (10:58 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 17:58:27 +0000 (10:58 -0700)
* maint/2.5.x/pick_compatible_new_functionality:
  Explicitly load functions used by ensure_resource
  re-formatting
  Add better docs about duplicate resource failures
  Handle undef for parameter argument
  Add function ensure_resource and defined_with_params


Trivial merge