diff options
| author | Chef Expeditor <chef-ci@chef.io> | 2021-03-27 03:05:38 +0000 |
|---|---|---|
| committer | Chef Expeditor <chef-ci@chef.io> | 2021-03-27 03:05:38 +0000 |
| commit | cf8f341d560d653bc41c3e650e5310dfef060c81 (patch) | |
| tree | 4b5e317d51ad42479a5f44a9b71dcb472f0ed489 | |
| parent | f16291dab84392208bfe08d5b840edeab2f1500d (diff) | |
| download | chef-cf8f341d560d653bc41c3e650e5310dfef060c81.tar.gz | |
Update CHANGELOG.md to reflect the promotion of 15.16.4
Obvious fix; these changes are the result of automation not creative thinking.
| -rw-r--r-- | CHANGELOG.md | 21 | ||||
| -rw-r--r-- | Dockerfile | 2 |
2 files changed, 10 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0047a6c9cf..32861736b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,22 +2,20 @@ This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/). -<!-- latest_release 15.16.4 --> -## [v15.16.4](https://github.com/chef/chef/tree/v15.16.4) (2021-03-26) - -#### Merged Pull Requests -- Sync over misc omnibus changes [#11253](https://github.com/chef/chef/pull/11253) ([tas50](https://github.com/tas50)) +<!-- latest_release --> <!-- latest_release --> -<!-- release_rollup since=15.16.2 --> -### Changes not yet released to stable - -#### Merged Pull Requests -- Sync over misc omnibus changes [#11253](https://github.com/chef/chef/pull/11253) ([tas50](https://github.com/tas50)) <!-- 15.16.4 --> -- CI fixes backported from Chef 16 [#11251](https://github.com/chef/chef/pull/11251) ([tas50](https://github.com/tas50)) <!-- 15.16.3 --> +<!-- release_rollup --> <!-- release_rollup --> <!-- latest_stable_release --> +## [v15.16.4](https://github.com/chef/chef/tree/v15.16.4) (2021-03-27) + +#### Merged Pull Requests +- CI fixes backported from Chef 16 [#11251](https://github.com/chef/chef/pull/11251) ([tas50](https://github.com/tas50)) +- Sync over misc omnibus changes [#11253](https://github.com/chef/chef/pull/11253) ([tas50](https://github.com/tas50)) +<!-- latest_stable_release --> + ## [v15.16.2](https://github.com/chef/chef/tree/v15.16.2) (2021-03-26) #### Merged Pull Requests @@ -31,7 +29,6 @@ This changelog lists individual merged pull requests to Chef Infra Client and ge - Backport several fixes and improvements for Chef 16 [#11245](https://github.com/chef/chef/pull/11245) ([tas50](https://github.com/tas50)) - Update InSpec to 4.29.3 [#11248](https://github.com/chef/chef/pull/11248) ([tas50](https://github.com/tas50)) - Resolve failures in testing due to an old rspec_junit_formatter [#11249](https://github.com/chef/chef/pull/11249) ([tas50](https://github.com/tas50)) -<!-- latest_stable_release --> ## [v15.15.0](https://github.com/chef/chef/tree/v15.15.0) (2021-01-06) diff --git a/Dockerfile b/Dockerfile index c4cceeede2..87e96ff274 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ FROM busybox LABEL maintainer="Chef Software, Inc. <docker@chef.io>" ARG CHANNEL=stable -ARG VERSION=15.16.2 +ARG VERSION=15.16.4 RUN wget "http://packages.chef.io/files/${CHANNEL}/chef/${VERSION}/el/6/chef-${VERSION}-1.el6.x86_64.rpm" -O /tmp/chef-client.rpm && \ rpm2cpio /tmp/chef-client.rpm | cpio -idmv && \ |