Merge pull request #418 from cyberious/UpcaseHash

Fix issue with 1.8.7 and upcase
xbezdick · Feb 26, 2015 · cd65680 · cd65680
2 parents 1ccc4f5 + 419f51b
commit cd65680
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/puppet/parser/functions/upcase.rb b/lib/puppet/parser/functions/upcase.rb
@@ -31,8 +31,8 @@ module Puppet::Parser::Functions
       result = value.collect { |i| i.is_a?(String) ? i.upcase : i }
     elsif value.is_a?(Hash)
       result = {}
-      result << value.each_pair do |k, v|
-        return {k.upcase => v.collect! { |p| p.upcase }}
+      value.each_pair do |k, v|
+        result.merge!({k.upcase => v.collect! { |p| p.upcase }})
       end
     else
       result = value.upcase