summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/merge.rb
AgeCommit message (Collapse)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
pass over undefs without failing
2011-08-18Docs: Improve example in merge functionJeff McCune
This commit replaces the example in the merge function with a much clearer one. It also mentions that the rightmost value wins in the event of duplicated hash keys.
2011-08-01(#8717) Make merge() function work with Ruby 1.8.5Jeff McCune
The previous behavior of the merge() function used Array#inject with two arguments. Ruby 1.8.5 only supports inject being used with one argument. This change initializes and empty Hash object and merges each argument into the accumulator. The last argument still "wins" in the merge. rspec tests (cd spec; rspec **/*_spec.rb) verified as passing with this change. Reviewed-by: Dan Bode
2011-07-29(#8709) Add hash merging functionDan Bode
In Puppet, it is not possible to reassign hash values. This function allows a reasonable way to perform hash munging in Puppet. Reviewed-by: Jeff McCune