summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/deep_merge.rb
diff options
context:
space:
mode:
authorDavid Schmitt <david.schmitt@puppetlabs.com>2015-07-14 09:47:22 +0100
committerDavid Schmitt <david.schmitt@puppetlabs.com>2015-07-14 09:47:22 +0100
commita0224412893d39463a4fde82887312b279f83e1b (patch)
tree1a15b2d40826fba5f0e2f57ba19bbb4c7c2c9325 /lib/puppet/parser/functions/deep_merge.rb
parent01fe9dc15c83e7855431a7fc1cff84204761ba0a (diff)
parentf485e6e2eb1d2ffa8c16402249bec96e0886b86b (diff)
downloadpuppet-stdlib-a0224412893d39463a4fde82887312b279f83e1b.tar.gz
puppet-stdlib-a0224412893d39463a4fde82887312b279f83e1b.tar.bz2
Merge pull request #485 from ghoneycutt/patch-2
Clarify that third argument to ensure_resource() is a hash
Diffstat (limited to 'lib/puppet/parser/functions/deep_merge.rb')
0 files changed, 0 insertions, 0 deletions