diff options
| author | Bryan McLellan <btm@loftninjas.org> | 2017-09-13 12:50:32 -0400 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2017-09-13 12:50:32 -0400 |
| commit | 6236c7c623de5dbd0658e9ae572d4cce9d265cc9 (patch) | |
| tree | 46192e9e00c99e32483dcc11230d6a9be8d5048a | |
| parent | a27e258ac912700f3787c81ba6bba783283cf0a5 (diff) | |
| download | chef-6236c7c623de5dbd0658e9ae572d4cce9d265cc9.tar.gz | |
Update changelog for last and next release
Hopefully this triggers a build as 12.21.11 and it succeeds.
Signed-off-by: Bryan McLellan <btm@loftninjas.org>
| -rw-r--r-- | CHANGELOG.md | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a60cd2e2ef..c513966fef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,19 @@ 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 [](https://badge.fury.io/rb/chef). +## [v12.21.11](https://github.com/chef/chef/tree/v12.21.10) (2017-09-13) +[Full Changelog](https://github.com/chef/chef/compare/v12.21.10...v12.21.11) + +- Backport #6383 (Fix dsc_script with WMF5) [\#6395](https://github.com/chef/chef/pull/6395) + +## [v12.21.10](https://github.com/chef/chef/tree/v12.21.10) (2017-09-11) +[Full Changelog](https://github.com/chef/chef/compare/v12.21.4...v12.21.10) + +- Rubygems 2.6.13 to fix CVE-2017-0899, CVE-2017-0900, CVE-2017-0901, CVE-2017-0902 +- Backport #6355 (speed up immutabilization) [\#6357](https://github.com/chef/chef/pull/6357) +- Backport #6356 (node attributes: remove useless dup in merge_all) [\#6358](https://github.com/chef/chef/pull/6358) + ## [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) +[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) @@ -1407,4 +1419,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)* |