diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 10:58:27 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 10:58:27 -0700 |
commit | 12a146058ee885e9ad295e978b15465259a905c5 (patch) | |
tree | edb57c2cf326241c762052ab6431d96f464f6033 /lib/puppet/parser/functions/str2saltedsha512.rb | |
parent | 9693c04c9d877e0f877418bc41e16f01aaf784cd (diff) | |
parent | c2573298a5a58ca902d1d04ca2f91dd85bef6581 (diff) | |
download | puppet-stdlib-12a146058ee885e9ad295e978b15465259a905c5.tar.gz puppet-stdlib-12a146058ee885e9ad295e978b15465259a905c5.tar.bz2 |
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
Diffstat (limited to 'lib/puppet/parser/functions/str2saltedsha512.rb')
0 files changed, 0 insertions, 0 deletions