]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
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)
commit12a146058ee885e9ad295e978b15465259a905c5
treeedb57c2cf326241c762052ab6431d96f464f6033
parent9693c04c9d877e0f877418bc41e16f01aaf784cd
parentc2573298a5a58ca902d1d04ca2f91dd85bef6581
Merge branch 'maint/2.5.x/pick_compatible_new_functionality' into 2.5.x

* 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