summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2021-01-13 01:13:18 +0000
committerChef Expeditor <chef-ci@chef.io>2021-01-13 01:13:18 +0000
commit53751d87107e459c049997a4c4e7c8dae8771df6 (patch)
tree3d7816910a4ea36e5f99c31aaf76968cecab1462
parentc957d409875f06746b987f423a500a387b56667f (diff)
downloadchef-53751d87107e459c049997a4c4e7c8dae8771df6.tar.gz
Update CHANGELOG.md to reflect the promotion of 16.9.20
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md23
-rw-r--r--Dockerfile2
2 files changed, 11 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0140a7fe1..2976407ecf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,28 +2,25 @@
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 16.9.20 -->
-## [v16.9.20](https://github.com/chef/chef/tree/v16.9.20) (2021-01-12)
-
-#### Merged Pull Requests
-- adapt to FreeBSD pkgng sysexit changes [#10867](https://github.com/chef/chef/pull/10867) ([tas50](https://github.com/tas50))
+<!-- latest_release -->
<!-- latest_release -->
-<!-- release_rollup since=16.9.17 -->
-### Changes not yet released to stable
-
-#### Merged Pull Requests
-- adapt to FreeBSD pkgng sysexit changes [#10867](https://github.com/chef/chef/pull/10867) ([tas50](https://github.com/tas50)) <!-- 16.9.20 -->
-- Compliance phase: change the audit cb checker to use the recipes list on the node [#10866](https://github.com/chef/chef/pull/10866) ([tas50](https://github.com/tas50)) <!-- 16.9.19 -->
-- Update chef-zero to 15.0.4 to resolve missing dep failures [#10857](https://github.com/chef/chef/pull/10857) ([tas50](https://github.com/tas50)) <!-- 16.9.18 -->
+<!-- release_rollup -->
<!-- release_rollup -->
<!-- latest_stable_release -->
+## [v16.9.20](https://github.com/chef/chef/tree/v16.9.20) (2021-01-13)
+
+#### Merged Pull Requests
+- Update chef-zero to 15.0.4 to resolve missing dep failures [#10857](https://github.com/chef/chef/pull/10857) ([tas50](https://github.com/tas50))
+- Compliance phase: change the audit cb checker to use the recipes list on the node [#10866](https://github.com/chef/chef/pull/10866) ([tas50](https://github.com/tas50))
+- adapt to FreeBSD pkgng sysexit changes [#10867](https://github.com/chef/chef/pull/10867) ([tas50](https://github.com/tas50))
+<!-- latest_stable_release -->
+
## [v16.9.17](https://github.com/chef/chef/tree/v16.9.17) (2021-01-09)
#### Merged Pull Requests
- Make sure our containers work on RHEL 6 [#10856](https://github.com/chef/chef/pull/10856) ([tas50](https://github.com/tas50))
-<!-- latest_stable_release -->
## [v16.9.16](https://github.com/chef/chef/tree/v16.9.16) (2021-01-05)
diff --git a/Dockerfile b/Dockerfile
index aa4bc3a62e..9b8cc84381 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ FROM busybox
LABEL maintainer="Chef Software, Inc. <docker@chef.io>"
ARG CHANNEL=stable
-ARG VERSION=16.9.17
+ARG VERSION=16.9.20
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 && \