summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/parseyaml.rb
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-10-25 10:57:45 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-10-25 10:57:45 -0700
commitc2573298a5a58ca902d1d04ca2f91dd85bef6581 (patch)
treeedb57c2cf326241c762052ab6431d96f464f6033 /lib/puppet/parser/functions/parseyaml.rb
parent699d520e72014a3a17395c52c04f5b521d1318e6 (diff)
parent9fc3063ea954bbd49cd2b8386bc69696a4af4114 (diff)
downloadpuppet-stdlib-c2573298a5a58ca902d1d04ca2f91dd85bef6581.tar.gz
puppet-stdlib-c2573298a5a58ca902d1d04ca2f91dd85bef6581.tar.bz2
Merge branch 'maint/2.5.x/pick_explicitly_load_functions' into maint/2.5.x/pick_compatible_new_functionality
* maint/2.5.x/pick_explicitly_load_functions: Explicitly load functions used by ensure_resource
Diffstat (limited to 'lib/puppet/parser/functions/parseyaml.rb')
0 files changed, 0 insertions, 0 deletions