diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-06-25 16:36:39 -0700 |
|---|---|---|
| committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-06-25 16:36:39 -0700 |
| commit | 769d3f5b38e07e49d5df9bb067168e1efacdd7e4 (patch) | |
| tree | b2a3b9e4821a7494a434185e45388ed588a01b1f | |
| parent | bba2a093aa7c0cda097650ce2f390ef63e648e52 (diff) | |
| parent | d7473d91ce424966ca58f0e8fdcc797e0c0c110c (diff) | |
| download | chef-769d3f5b38e07e49d5df9bb067168e1efacdd7e4.tar.gz | |
Merge branch 'jdm/changelog'
| -rw-r--r-- | CHANGELOG.md | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index df15462289..76b772976e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ -## 12.5.0 +## Unreleased * [**Ranjib Dey**](https://github.com/ranjib): [pr#3588](https://github.com/chef/chef/pull/3588) Count skipped resources among total resources in doc formatter +* [pr#3586](https://github.com/chef/chef/issues/3586) Fix bug preventing light weight resources from being used with heavy weight providers +* [Issue #3593](https://github.com/chef/chef/issues/3586) Fix bug where provider priority map did not take into consideration a provided block + ## 12.4.0 * [**Phil Dibowitz**](https://github.com/jaymzh): |