summaryrefslogtreecommitdiff
path: root/spec/unit/puppet/parser/functions/merge_spec.rb
AgeCommit message (Expand)Author
2012-08-20(Maint) Fix mis-use of rvalue functions as statementsJeff McCune
2011-07-29(#8709) Add hash merging functionDan Bode