diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-12-19 21:49:09 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-12-19 21:49:09 +0000 |
| commit | c3658771a5e22f8c214fc054fba016b02901ed0f (patch) | |
| tree | 42e2eb53df32fb5cfc2f5210630096c6f3bd20bf | |
| parent | 5f1986bea648b48afe48212a72049ba8d2c16fd6 (diff) | |
| download | chef-c3658771a5e22f8c214fc054fba016b02901ed0f.tar.gz | |
Update CHANGELOG.md to reflect the promotion of 12.21.31 to stable
| -rw-r--r-- | CHANGELOG.md | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f98377983..80b4389308 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,23 +1,21 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 12.21.31 --> -## [v12.21.31](https://github.com/chef/chef/tree/v12.21.31) (2017-12-19) - -#### Merged Pull Requests -- Backport acceptance changes [#6681](https://github.com/chef/chef/pull/6681) ([scotthain](https://github.com/scotthain)) +<!-- latest_release --> <!-- latest_release --> -<!-- release_rollup since=13.6.4 --> -### Changes since 13.6.4 release - -#### Merged Pull Requests -- Backport acceptance changes [#6681](https://github.com/chef/chef/pull/6681) ([scotthain](https://github.com/scotthain)) <!-- 12.21.31 --> -- Update openssl to 1.0.2.n [#6666](https://github.com/chef/chef/pull/6666) ([tas50](https://github.com/tas50)) <!-- 12.21.30 --> -- Backport RHEL and ifconfig test fixes [#6659](https://github.com/chef/chef/pull/6659) ([scotthain](https://github.com/scotthain)) <!-- 12.21.29 --> -- Use Chef::VersionConstraint in useradd_spec test [#6586](https://github.com/chef/chef/pull/6586) ([jeremiahsnapp](https://github.com/jeremiahsnapp)) <!-- 12.21.28 --> -- Change a useradd_spec test for RHEL >= 6.8 and >= 7.3 [#6556](https://github.com/chef/chef/pull/6556) ([jeremiahsnapp](https://github.com/jeremiahsnapp)) <!-- 12.21.27 --> +<!-- release_rollup --> <!-- release_rollup --> <!-- latest_stable_release --> +## [v12.21.31](https://github.com/chef/chef/tree/v12.21.31) (2017-12-19) + +#### Merged Pull Requests +- Change a useradd_spec test for RHEL >= 6.8 and >= 7.3 [#6556](https://github.com/chef/chef/pull/6556) ([jeremiahsnapp](https://github.com/jeremiahsnapp)) +- Use Chef::VersionConstraint in useradd_spec test [#6586](https://github.com/chef/chef/pull/6586) ([jeremiahsnapp](https://github.com/jeremiahsnapp)) +- Backport RHEL and ifconfig test fixes [#6659](https://github.com/chef/chef/pull/6659) ([scotthain](https://github.com/scotthain)) +- Update openssl to 1.0.2.n [#6666](https://github.com/chef/chef/pull/6666) ([tas50](https://github.com/tas50)) +- Backport acceptance changes [#6681](https://github.com/chef/chef/pull/6681) ([scotthain](https://github.com/scotthain)) +<!-- latest_stable_release --> + ## [v12.21.26](https://github.com/chef/chef/tree/v12.21.26) (2017-10-30) #### Merged Pull Requests @@ -27,7 +25,6 @@ - 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) |