diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2011-12-30 11:48:21 -0800 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2011-12-30 11:48:21 -0800 |
commit | 80c9a8feeae6203026f61215e100e95078c61a04 (patch) | |
tree | e70920f96b88bdc9e985e2439f395371d5ffe2be /lib/puppet/parser/functions/merge.rb | |
parent | 1434f3cea6f6e2a1b939d91cb5ff66338cc87d32 (diff) | |
parent | a8d4bbd9e234ea577e27d83df95a61b374ac484b (diff) | |
download | puppet-stdlib-80c9a8feeae6203026f61215e100e95078c61a04.tar.gz puppet-stdlib-80c9a8feeae6203026f61215e100e95078c61a04.tar.bz2 |
Merge branch 'v2.1.x' into v2.2.x
* v2.1.x:
(maint) Add semantic versioning info to README
Docs: Clarify the use case for the anchor type
Docs: Remove author emails from stdlib functions
Docs: Copyedit function doc strings
Docs: Correct indentation of markdown code examples
Docs: Update documentation of stdlib classes
Docs: Update file_line documentation
Docs: Improve example in merge function
Diffstat (limited to 'lib/puppet/parser/functions/merge.rb')
-rw-r--r-- | lib/puppet/parser/functions/merge.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/puppet/parser/functions/merge.rb b/lib/puppet/parser/functions/merge.rb index d2dc0f9..6ec085e 100644 --- a/lib/puppet/parser/functions/merge.rb +++ b/lib/puppet/parser/functions/merge.rb @@ -4,10 +4,13 @@ module Puppet::Parser::Functions For example: - $hash1 = {'one' => 1, 'two', => 2} - $hash1 = {'two' => 2, 'three', => 2} - $merged_hash = merge($hash1, $hash2) - # merged_hash = {'one' => 1, 'two' => 2, 'three' => 2} + $hash1 = {'one' => 1, 'two', => 2} + $hash2 = {'two' => 'dos', 'three', => 'tres'} + $merged_hash = merge($hash1, $hash2) + # The resulting hash is equivalent to: + # $merged_hash = {'one' => 1, 'two' => 'dos', 'three' => 'tres'} + + When there is a duplicate key, the key in the rightmost hash will "win." ENDHEREDOC |