diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-30 18:17:09 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-30 18:17:09 +0000 |
| commit | d1bcbb3d04159c320f58ed526455ab96cf596ac7 (patch) | |
| tree | 6b333dff9ca6d11e3bf3b6a700b7d078a01991b5 | |
| parent | a7148bb5ab0572d2b5a277848f3bc10f5259042b (diff) | |
| download | chef-d1bcbb3d04159c320f58ed526455ab96cf596ac7.tar.gz | |
Update CHANGELOG.md to reflect the promotion of 12.21.26 to stable
| -rw-r--r-- | CHANGELOG.md | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0eb8c68141..e3d6eba2e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,24 +1,22 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 12.21.26 --> -## [v12.21.26](https://github.com/chef/chef/tree/v12.21.26) (2017-10-27) - -#### Merged Pull Requests -- Update liblzma, libxml2, libxslt, libyaml, zlib, and openssl [#6531](https://github.com/chef/chef/pull/6531) ([tas50](https://github.com/tas50)) +<!-- latest_release --> <!-- latest_release --> -<!-- release_rollup since=13.5.3 --> -### Changes since 13.5.3 release - -#### Merged Pull Requests -- Update liblzma, libxml2, libxslt, libyaml, zlib, and openssl [#6531](https://github.com/chef/chef/pull/6531) ([tas50](https://github.com/tas50)) <!-- 12.21.26 --> -- Update ruby version required in readme [#6517](https://github.com/chef/chef/pull/6517) ([tas50](https://github.com/tas50)) <!-- 12.21.25 --> -- Pull in Ohai 8.25 [#6509](https://github.com/chef/chef/pull/6509) ([tas50](https://github.com/tas50)) <!-- 12.21.24 --> -- Use Rubygems 2.6.14 to fix CVE-2017-0903 [#6507](https://github.com/chef/chef/pull/6507) ([tas50](https://github.com/tas50)) <!-- 12.21.23 --> -- Pull in Ohai 8.24.1 [#6506](https://github.com/chef/chef/pull/6506) ([tas50](https://github.com/tas50)) <!-- 12.21.22 --> -- Don't use the safe navigation operator which requires Ruby 2.3 [#6508](https://github.com/chef/chef/pull/6508) ([tas50](https://github.com/tas50)) <!-- 12.21.21 --> +<!-- release_rollup --> <!-- release_rollup --> <!-- latest_stable_release --> +## [v12.21.26](https://github.com/chef/chef/tree/v12.21.26) (2017-10-30) + +#### Merged Pull Requests +- Don't use the safe navigation operator which requires Ruby 2.3 [#6508](https://github.com/chef/chef/pull/6508) ([tas50](https://github.com/tas50)) +- Pull in Ohai 8.24.1 [#6506](https://github.com/chef/chef/pull/6506) ([tas50](https://github.com/tas50)) +- Use Rubygems 2.6.14 to fix CVE-2017-0903 [#6507](https://github.com/chef/chef/pull/6507) ([tas50](https://github.com/tas50)) +- Pull in Ohai 8.25 [#6509](https://github.com/chef/chef/pull/6509) ([tas50](https://github.com/tas50)) +- Update ruby version required in readme [#6517](https://github.com/chef/chef/pull/6517) ([tas50](https://github.com/tas50)) +- Update liblzma, libxml2, libxslt, libyaml, zlib, and openssl [#6531](https://github.com/chef/chef/pull/6531) ([tas50](https://github.com/tas50)) +<!-- latest_stable_release --> + ## [v12.21.20](https://github.com/chef/chef/tree/v12.21.20) (2017-10-18) #### Merged Pull Requests @@ -28,7 +26,6 @@ - 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 --> |