summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2020-08-18 21:50:06 +0000
committerChef Expeditor <chef-ci@chef.io>2020-08-18 21:50:06 +0000
commitd1984935869a71289c89af442eff2371d9188bc1 (patch)
treea0bf8b12d76115e3c533228bbedd972c016f01dd
parent7fb14323429eac7fbcc2294bb934586d1544821c (diff)
downloadchef-d1984935869a71289c89af442eff2371d9188bc1.tar.gz
Update CHANGELOG.md to reflect the promotion of 16.4.38
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 a0a20fe1de..602e3e1ccd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,19 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.4.38 -->
-## [v16.4.38](https://github.com/chef/chef/tree/v16.4.38) (2020-08-18)
-
-#### Merged Pull Requests
-- Fix removing non-existent profile with osx_profile [#10324](https://github.com/chef/chef/pull/10324) ([lamont-granquist](https://github.com/lamont-granquist))
+<!-- latest_release -->
<!-- latest_release -->
-<!-- release_rollup since=16.4.35 -->
-### Changes not yet released to stable
-
-#### Merged Pull Requests
-- Fix removing non-existent profile with osx_profile [#10324](https://github.com/chef/chef/pull/10324) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 16.4.38 -->
-- Further improve osx_profile error message and add a test [#10320](https://github.com/chef/chef/pull/10320) ([tas50](https://github.com/tas50)) <!-- 16.4.37 -->
-- Fix typo and macOS version evaluation logic in `osx_profile` resource [#10319](https://github.com/chef/chef/pull/10319) ([ChefAustin](https://github.com/ChefAustin)) <!-- 16.4.36 -->
+<!-- release_rollup -->
<!-- release_rollup -->
<!-- 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)
#### Merged Pull Requests
@@ -84,7 +82,6 @@
- Fix bootstrapping windows-from-linux [#10298](https://github.com/chef/chef/pull/10298) ([lamont-granquist](https://github.com/lamont-granquist))
- Add 16.4 release notes [#10304](https://github.com/chef/chef/pull/10304) ([tas50](https://github.com/tas50))
- Update train to 3.3.16 [#10309](https://github.com/chef/chef/pull/10309) ([tas50](https://github.com/tas50))
-<!-- latest_stable_release -->
## [v16.3.45](https://github.com/chef/chef/tree/v16.3.45) (2020-07-29)
diff --git a/Dockerfile b/Dockerfile
index 96873a1d7c..3c47d5c222 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.35
+ARG VERSION=16.4.38
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 && \