summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerdar Sutay <serdar@opscode.com>2014-12-10 12:16:02 -0800
committerSerdar Sutay <serdar@opscode.com>2014-12-10 12:16:02 -0800
commit12fea0d9fa44a521f7663b1d27ba4945b06a660b (patch)
tree57358db5aa0bae19e0786f814f24b85510c08fff
parent1c2579ccbde1339c5dd1bd0612068aefbfc64b75 (diff)
downloadchef-12fea0d9fa44a521f7663b1d27ba4945b06a660b.tar.gz
Resolve the circular dependency between ProviderResolver and Resource.
-rw-r--r--lib/chef/resource.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb
index 8d964da66d..d2718c859e 100644
--- a/lib/chef/resource.rb
+++ b/lib/chef/resource.rb
@@ -29,7 +29,6 @@ require 'chef/resource/conditional_action_not_nothing'
require 'chef/resource_collection'
require 'chef/node_map'
require 'chef/node'
-require 'chef/provider_resolver'
require 'chef/platform'
require 'chef/mixin/deprecation'
@@ -833,3 +832,7 @@ F
end
end
end
+
+# We require this at the BOTTOM of this file to avoid circular requires (it is used
+# at runtime but not load time)
+require 'chef/provider_resolver'