summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2020-08-19 21:10:18 +0000
committerChef Expeditor <chef-ci@chef.io>2020-08-19 21:10:18 +0000
commitf2894d7147483011c8d94473a5994ed72922bf1d (patch)
tree0a44f944ff0496ac18ac69abb5bd91b57c866f05
parent0f3f63d6f427368eb2d0193c4e363d8a6f7d6f9a (diff)
downloadchef-f2894d7147483011c8d94473a5994ed72922bf1d.tar.gz
Update CHANGELOG.md to reflect the promotion of 16.4.41
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 3a80549e8e..8c36bcbfed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,28 +1,25 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.4.41 -->
-## [v16.4.41](https://github.com/chef/chef/tree/v16.4.41) (2020-08-19)
-
-#### Merged Pull Requests
-- Update Ohai to 16.4.11 to resolve Windows IP detection [#10327](https://github.com/chef/chef/pull/10327) ([tas50](https://github.com/tas50))
+<!-- latest_release -->
<!-- latest_release -->
-<!-- release_rollup since=16.4.38 -->
-### Changes not yet released to stable
-
-#### Merged Pull Requests
-- Update Ohai to 16.4.11 to resolve Windows IP detection [#10327](https://github.com/chef/chef/pull/10327) ([tas50](https://github.com/tas50)) <!-- 16.4.41 -->
-- Add missing requires for knife configure command [#10329](https://github.com/chef/chef/pull/10329) ([tas50](https://github.com/tas50)) <!-- 16.4.40 -->
-- Refactor the timezone resource to properly load the current timezone [#10323](https://github.com/chef/chef/pull/10323) ([tas50](https://github.com/tas50)) <!-- 16.4.39 -->
+<!-- release_rollup -->
<!-- release_rollup -->
<!-- latest_stable_release -->
+## [v16.4.41](https://github.com/chef/chef/tree/v16.4.41) (2020-08-19)
+
+#### Merged Pull Requests
+- Refactor the timezone resource to properly load the current timezone [#10323](https://github.com/chef/chef/pull/10323) ([tas50](https://github.com/tas50))
+- Add missing requires for knife configure command [#10329](https://github.com/chef/chef/pull/10329) ([tas50](https://github.com/tas50))
+- Update Ohai to 16.4.11 to resolve Windows IP detection [#10327](https://github.com/chef/chef/pull/10327) ([tas50](https://github.com/tas50))
+<!-- latest_stable_release -->
+
## [v16.4.38](https://github.com/chef/chef/tree/v16.4.38) (2020-08-18)
#### Merged Pull Requests
- Fix typo and macOS version evaluation logic in `osx_profile` resource [#10319](https://github.com/chef/chef/pull/10319) ([ChefAustin](https://github.com/ChefAustin))
- Further improve osx_profile error message and add a test [#10320](https://github.com/chef/chef/pull/10320) ([tas50](https://github.com/tas50))
- Fix removing non-existent profile with osx_profile [#10324](https://github.com/chef/chef/pull/10324) ([lamont-granquist](https://github.com/lamont-granquist))
-<!-- latest_stable_release -->
## [v16.4.35](https://github.com/chef/chef/tree/v16.4.35) (2020-08-18)
diff --git a/Dockerfile b/Dockerfile
index 3c47d5c222..86359f927e 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.4.38
+ARG VERSION=16.4.41
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 && \