summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/merge.rb
AgeCommit message (Expand)Author
2011-08-01(#8717) Make merge() function work with Ruby 1.8.5Jeff McCune
2011-07-29(#8709) Add hash merging functionDan Bode