summaryrefslogtreecommitdiff
path: root/spec/unit/puppet/parser/functions/deep_merge_spec.rb
AgeCommit message (Collapse)Author
2014-03-11Merge pull request #220 from mediatemple/fix/master/deep_merge_fixAshley Penney
PUP-1724 Don't modify the paramaters to deep_merge
2014-03-08Numerous changes to update testing gems.Ashley Penney
This work updates a number of Gems to the latest versions (rspec, rspec-puppet), and updates and tweaks a bunch of tests to work with the updated gems.
2014-02-17PUP-1724 Don't modify the paramaters to deep_mergeJustin Burnham
Instead of modifying the first paramater of deep_merge due to the use of the merge! function, instead use merge to return a copy of the merged object. This allows one to continue to use the original first parameter after the call to deep_merge.
2013-10-29(#20200) Add a recursive merge function.Justin Burnham
Issue #20200 notes that the merge function does not support nested hashes. To prevent unintended side effects with changing merge, add a deep_merge function instead.