summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@loftninjas.org>2017-08-15 13:56:25 -0400
committerBryan McLellan <btm@loftninjas.org>2017-08-15 13:56:25 -0400
commit4ba94438788706ceae12706c539d5cda101fb89b (patch)
tree17816cd7fa249c8d357eb71377842bff100c3474
parent85500185dbafd6c91b3928e757e8b9435f79a8f9 (diff)
downloadchef-4ba94438788706ceae12706c539d5cda101fb89b.tar.gz
Update Changelog for v12.21.4 build
Signed-off-by: Bryan McLellan <btm@loftninjas.org>
-rw-r--r--CHANGELOG.md12
1 files changed, 11 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e862be8636..3a955e270a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
This changelog reflects the current state of chef's 12 branch on github and may not reflect the current released version of chef, which is [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef).
+## [v12.21.4](https://github.com/chef/chef/tree/v12.21.4) (2017-08-14)
+[Full Changelog](https://github.com/chef/chef/compare/v12.21.3.v12.21.4)
+
+**Fixed bugs:**
+- Backport #5941 (Make ResourceReporter smarter to get resource identity and state) [\#6308](https://github.com/chef/chef/pull/6308)
+
+**Tech cleanup:**
+- Add Expeditor to chef-12 branch [\#6328](https://github.com/chef/chef/pull/6328)
+- Bump omnibus-software to fix early Rubygems segfaults on Windows [\#6329](https://github.com/chef/chef/pull/6329)
+
## [v12.21.3](https://github.com/chef/chef/tree/v12.21.3) (2017-06-23)
[Full Changelog](https://github.com/chef/chef/compare/v12.21.2...v12.21.3)
@@ -1397,4 +1407,4 @@ of partial templates.
* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)
* Windows package type should be a symbol (Fixes #1997)
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*