summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/merge.rb
AgeCommit message (Expand)Author
2013-05-08fix in merge.rb: refine the checking if an argument is an empty stringMartin Hellmich
2013-04-22check if an argument supposed to be merged is empty toMartin Hellmich
2011-08-18Docs: Improve example in merge functionJeff McCune
2011-08-01(#8717) Make merge() function work with Ruby 1.8.5Jeff McCune
2011-07-29(#8709) Add hash merging functionDan Bode