Merge pull request #2610 from opscode/sersut/circular-dep-fix

Resolve the circular dependency between ProviderResolver and Resource.

2 files changed, 18 insertions, 7 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4afea31c5b..02d092953d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Unreleased
+## 12.1.0 (Unreleased)
 
 * [**Vasiliy Tolstov**](https://github.com/vtolstov):
   cleanup cookbook path from stale files (when using chef-solo with a tarball url)
@@ -22,13 +22,21 @@
 ### Chef Contributions
 * ruby 1.9.3 support is dropped
 * Update Chef to use RSpec 3.
-* Create constant for LWRP before calling `provides`
 * Cleaned up script and execute provider + specs
 * Added deprecation warnings around the use of command attribute in script resources
-* `path` attribute of `execute` resource is restored to provide backwards compatibility with Chef 11.
-* Fix `Chef::Knife::Core::BootstrapContext` constructor for knife-windows compat.
-* Make sure Client doesn't raise error when interval is set on Windows.
-* Check that `installed` is not empty for `keg_only` formula in Homebrew provider
+
+## 12.0.2 (Unreleased)
+* [Issue 2578](https://github.com/opscode/chef/issues/2578) Check that `installed` is not empty for `keg_only` formula in Homebrew provider.
+* [Issue 2609](https://github.com/opscode/chef/issues/2609) Resolve the circular dependency between ProviderResolver and Resource.
+
+## 12.0.1
+
+* [Issue 2552](https://github.com/opscode/chef/issues/2552) Create constant for LWRP before calling `provides`
+* [Issue 2545](https://github.com/opscode/chef/issues/2545) `path` attribute of `execute` resource is restored to provide backwards compatibility with Chef 11.
+* [Issue 2565](https://github.com/opscode/chef/issues/2565) Fix `Chef::Knife::Core::BootstrapContext` constructor for knife-windows compat.
+* [Issue 2566](https://github.com/opscode/chef/issues/2566) Make sure Client doesn't raise error when interval is set on Windows.
+* [Issue 2560](https://github.com/opscode/chef/issues/2560) Fix `uninitialized constant Windows::Constants` in `windows_eventlog`.
+* [Issue 2563](https://github.com/opscode/chef/issues/2563) Make sure the Chef Client rpm packages are signed with GPG keys correctly.
 
 ## 12.0.0
 
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'