summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Murawski <steven.murawski@gmail.com>2015-10-21 10:50:05 -0500
committerSteven Murawski <steven.murawski@gmail.com>2015-10-21 10:50:05 -0500
commitdb2cd5e0732be6182616390d13e582335120d7cb (patch)
treecd64879d5d1f171693d85ae4f44f05f533603090
parent3deff0b4f5d483eadbdf902806ee0cdbd61ad29c (diff)
parentf324955feb0bb694b69b7c107986b5995df094e0 (diff)
downloadchef-db2cd5e0732be6182616390d13e582335120d7cb.tar.gz
Merge pull request #4086 from chef/smurawski/changelog_pr4021
Add CHANGELOG for PR #4021
-rw-r--r--CHANGELOG.md6
-rw-r--r--lib/chef/provider/lwrp_base.rb1
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e6be4a71f..ed2c37ef1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
* [pr#4034](https://github.com/chef/chef/pull/4034) add optional ruby-profiling with --profile-ruby
* [pr#3119](https://github.com/chef/chef/pull/3119) allow removing user, even if their GID isn't resolvable
* [pr#4068](https://github.com/chef/chef/pull/4068) update messaging from LWRP to Custom Resource in logging and spec
+* [pr#4021](https://github.com/chef/chef/pull/4021) add missing requires for Chef::DSL::Recipe to LWRPBase
+
+## 12.5.1
+
+* [**Ranjib Dey**](https://github.com/ranjib):
+ [pr#3588](https://github.com/chef/chef/pull/3588) Count skipped resources among total resources in doc formatter
## 12.5.1
diff --git a/lib/chef/provider/lwrp_base.rb b/lib/chef/provider/lwrp_base.rb
index a96c382a01..9c7cd15bbf 100644
--- a/lib/chef/provider/lwrp_base.rb
+++ b/lib/chef/provider/lwrp_base.rb
@@ -19,6 +19,7 @@
#
require 'chef/provider'
+require 'chef/dsl/recipe'
require 'chef/dsl/include_recipe'
class Chef