diff options
author | mh <mh@immerda.ch> | 2011-10-08 20:07:53 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2011-10-08 20:07:53 +0200 |
commit | e90839b24871f9cfd2166a116e45de5f27fe9e50 (patch) | |
tree | f73ee8f5e5b0b9113b5d7b94121a9ead8be7a84b /lib/puppet/parser/functions/hash_merge.rb | |
parent | 2352be71bf3fe16ccfec10dff48a78aeae64d834 (diff) |
remove a couple of functions that can now be found in the puppetlabs stdlib
Diffstat (limited to 'lib/puppet/parser/functions/hash_merge.rb')
-rw-r--r-- | lib/puppet/parser/functions/hash_merge.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/puppet/parser/functions/hash_merge.rb b/lib/puppet/parser/functions/hash_merge.rb deleted file mode 100644 index 831c754..0000000 --- a/lib/puppet/parser/functions/hash_merge.rb +++ /dev/null @@ -1,10 +0,0 @@ -Puppet::Parser::Functions::newfunction( - :hash_merge, - :type => :rvalue, - :doc => "Merges two hashes - - Example: hash_merge({'a' => 1 ,'b' => 2},{'b' => 3, 'c' => 4}) -> {'a' => 1 ,'b' => 3, 'c' => 4}" -) do |args| - raise Puppet::ParseError, 'hash_merge() needs two arguments' if args.length != 2 - args[0].merge(args[1]) -end |