summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-08-17 09:56:56 -0700
committerGitHub <noreply@github.com>2017-08-17 09:56:56 -0700
commit0b21ee364c36fe442e5f519fbbff232095c3c505 (patch)
tree96df52b9f76155f276135b9ec5ac32028d69bb6f
parentaec60b46372a762a7f08c4825f68f81859fac12f (diff)
downloadchef-0b21ee364c36fe442e5f519fbbff232095c3c505.tar.gz
Add v12.21.4 to master's changelog
A more perm solution to this problem would be nice, but until then we're forward porting changelog entries. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--CHANGELOG.md25
1 files changed, 20 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f377625651..02b2b8ca0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,7 +42,6 @@
<!-- latest_stable_release -->
-
## [v13.3.27](https://github.com/chef/chef/tree/v13.3.27) (2017-07-26)
[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.3.27)
@@ -169,11 +168,27 @@
- Remove resource cloning and 3694 warnings
- HTTP: add debug long for non-JSON response
-## v12.21.3 (2017-06-23)
-- Properly send run_list_expanded event in policy node case
+## [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:**
+- Bump omnibus-software to fix early Rubygems segfaults on Windows [\#6329](https://github.com/chef/chef/pull/6329)
+- Upgrade Ruby from 2.3.1 to 2.3.4
+- Upgrade libiconv from 1.14 to 1.15
+- Upgrade Rubygems from 2.6.10 to 2.6.12
+
+## [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.1...v12.21.3)
+
+**Fixed bugs:**
+- Properly send expanded run list event for policy file nodes [\#6229](https://github.com/chef/chef/pull/6229) / [\#6233](https://github.com/chef/chef/pull/6233)
-## v12.21.1 (2017-06-20)
+## [v12.21.1](https://github.com/chef/chef/tree/v12.21.1) (2017-06-20)
+[Full Changelog](https://github.com/chef/chef/compare/v12.21.0...v12.21.1)
- Handle the supports pseudo-property more gracefully [\#6222](https://github.com/chef/chef/pull/6222) ([coderanger](https://github.com/coderanger))
- Provide better system information when Chef crashes [\#6173](https://github.com/chef/chef/pull/6173) ([coderanger](https://github.com/coderanger))
@@ -1548,4 +1563,4 @@ of partial templates.
* Fixed a bug where nested resources that inherited from Resource::LWRPBase
would not share the same actions/default_action as their parent
* Raise error if a guard_interpreter is specified and a block is passed to a guard (conditional)
-* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943) \ No newline at end of file
+* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)