summaryrefslogtreecommitdiff
path: root/spec/unit/puppet/parser/functions/deep_merge_spec.rb
AgeCommit message (Expand)Author
2014-03-11Merge pull request #220 from mediatemple/fix/master/deep_merge_fixAshley Penney
2014-03-08Numerous changes to update testing gems.Ashley Penney
2014-02-17PUP-1724 Don't modify the paramaters to deep_mergeJustin Burnham
2013-10-29(#20200) Add a recursive merge function.Justin Burnham