Skip to content
Browse files

fix namespace collision for Hash object

  • Loading branch information...
1 parent f79060e commit e899ef54d14b14d08917ab5951d3a665b9c5a571 @rdark rdark committed
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/puppet/parser/util/merger.rb
View
4 lib/puppet/parser/util/merger.rb
@@ -25,11 +25,11 @@ def compute_inner kvs1, kvs2
# union merge all items of kvs2
} | kvs2.reject { |k, v| kvs1.has_key? k }.to_a
- Hash[ merged ]
+ ::Hash[ merged ]
end
def is_hashish? thing
return false if thing.nil?
[:each, :fetch, :"has_key?", :reject].all? { |m| thing.respond_to? m }
end
end
-end
+end

0 comments on commit e899ef5

Please sign in to comment.
Something went wrong with that request. Please try again.