diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-18 19:11:37 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-18 19:11:37 +0000 |
| commit | f7f22101e73459b8ce21a92b47dedfae4f256309 (patch) | |
| tree | 56d8b8858601f259f416211f0990d82d2e9eceb1 | |
| parent | 5747a43b5ce8117e3b11664423ef598966feab1a (diff) | |
| download | chef-f7f22101e73459b8ce21a92b47dedfae4f256309.tar.gz | |
Update CHANGELOG.md to reflect the promotion of 12.21.20 to stable
| -rw-r--r-- | CHANGELOG.md | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 910b606b3c..98fbac711f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,26 +1,24 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 12.21.20 --> -## [v12.21.20](https://github.com/chef/chef/tree/v12.21.20) (2017-10-17) - -#### Merged Pull Requests -- MSYS-684: Added parser for DSC configuration [#6500](https://github.com/chef/chef/pull/6500) ([btm](https://github.com/btm)) +<!-- latest_release --> <!-- latest_release --> -<!-- release_rollup since=13.5.3 --> -### Changes since 13.5.3 release - -#### Merged Pull Requests -- MSYS-684: Added parser for DSC configuration [#6500](https://github.com/chef/chef/pull/6500) ([btm](https://github.com/btm)) <!-- 12.21.20 --> -- bump a copyright date to kick off a build [#6501](https://github.com/chef/chef/pull/6501) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 12.21.19 --> -- Add environment/cwd to bundle freeze script [#6499](https://github.com/chef/chef/pull/6499) ([scotthain](https://github.com/scotthain)) <!-- 12.21.18 --> -- backport of #6490 [#6492](https://github.com/chef/chef/pull/6492) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 12.21.17 --> -- Support new CriticalOhaiPlugins (backport #6486 to chef-12) [#6487](https://github.com/chef/chef/pull/6487) ([jaymzh](https://github.com/jaymzh)) <!-- 12.21.16 --> -- Backport #6435 to Chef-12: dnf_resource [#6436](https://github.com/chef/chef/pull/6436) ([NaomiReeves](https://github.com/NaomiReeves)) <!-- 12.21.15 --> +<!-- release_rollup --> <!-- release_rollup --> <!-- latest_stable_release --> +## [v12.21.20](https://github.com/chef/chef/tree/v12.21.20) (2017-10-18) + +#### Merged Pull Requests +- Backport #6435 to Chef-12: dnf_resource [#6436](https://github.com/chef/chef/pull/6436) ([NaomiReeves](https://github.com/NaomiReeves)) +- Support new CriticalOhaiPlugins (backport #6486 to chef-12) [#6487](https://github.com/chef/chef/pull/6487) ([jaymzh](https://github.com/jaymzh)) +- backport of #6490 [#6492](https://github.com/chef/chef/pull/6492) ([lamont-granquist](https://github.com/lamont-granquist)) +- Add environment/cwd to bundle freeze script [#6499](https://github.com/chef/chef/pull/6499) ([scotthain](https://github.com/scotthain)) +- bump a copyright date to kick off a build [#6501](https://github.com/chef/chef/pull/6501) ([lamont-granquist](https://github.com/lamont-granquist)) +- MSYS-684: Added parser for DSC configuration [#6500](https://github.com/chef/chef/pull/6500) ([btm](https://github.com/btm)) <!-- latest_stable_release --> + + ## [v12.21.11](https://github.com/chef/chef/tree/v12.21.11) (2017-09-13) [Full Changelog](https://github.com/chef/chef/compare/v12.21.10...v12.21.11) |