summaryrefslogtreecommitdiff
path: root/lib/chef/mixin/properties.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef/mixin/properties.rb')
-rw-r--r--lib/chef/mixin/properties.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/mixin/properties.rb b/lib/chef/mixin/properties.rb
index 2e33d2d0e7..1ee16b8b4a 100644
--- a/lib/chef/mixin/properties.rb
+++ b/lib/chef/mixin/properties.rb
@@ -98,7 +98,8 @@ class Chef
options.each { |k, v| options[k.to_sym] = v if k.is_a?(String) }
options[:instance_variable_name] = :"@#{name}" if !options.has_key?(:instance_variable_name)
- options.merge!(name: name, declared_in: self)
+ options[:name] = name
+ options[:declared_in] = self
if type == NOT_PASSED
# If a type is not passed, the property derives from the