summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-11-18 22:45:08 -0800
committerSerdar Sutay <serdar@opscode.com>2014-11-19 15:42:30 -0800
commit1d0ae0156e14d0366d8b171361613abeea92917c (patch)
tree1ce81d2a98287b827b35dcfd86d5de123e03209d
parente8b2b0675fa9cd3e583feb4f0a205bc86c80dee2 (diff)
downloadchef-1d0ae0156e14d0366d8b171361613abeea92917c.tar.gz
remove cache resetting
-rw-r--r--lib/chef/node/attribute.rb6
-rw-r--r--lib/chef/node/attribute_collections.rb3
2 files changed, 0 insertions, 9 deletions
diff --git a/lib/chef/node/attribute.rb b/lib/chef/node/attribute.rb
index 59a4067d9e..56034a60e4 100644
--- a/lib/chef/node/attribute.rb
+++ b/lib/chef/node/attribute.rb
@@ -230,12 +230,6 @@ class Chef
@set_unless_present = setting
end
- def reset_cache
- # FIXME: REMOVED IN CHEF-12
- end
-
- alias :reset :reset_cache
-
# Set the cookbook level default attribute component to +new_data+.
def default=(new_data)
@default = VividMash.new(self, new_data)
diff --git a/lib/chef/node/attribute_collections.rb b/lib/chef/node/attribute_collections.rb
index c8bc618762..3b19a14d1c 100644
--- a/lib/chef/node/attribute_collections.rb
+++ b/lib/chef/node/attribute_collections.rb
@@ -63,7 +63,6 @@ class Chef
MUTATOR_METHODS.each do |mutator|
class_eval(<<-METHOD_DEFN, __FILE__, __LINE__)
def #{mutator}(*args, &block)
- root.reset_cache
super
end
METHOD_DEFN
@@ -128,7 +127,6 @@ class Chef
MUTATOR_METHODS.each do |mutator|
class_eval(<<-METHOD_DEFN, __FILE__, __LINE__)
def #{mutator}(*args, &block)
- root.reset_cache
super
end
METHOD_DEFN
@@ -153,7 +151,6 @@ class Chef
if set_unless? && key?(key)
self[key]
else
- root.reset_cache
super
end
end