summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2021-04-02 22:52:02 +0000
committerChef Expeditor <chef-ci@chef.io>2021-04-02 22:52:02 +0000
commitd8641b31bc0c557e10ce4e1dd0856fb61bb3efd5 (patch)
treec4ce4d25704d7454d3823a4a92fbaf2b40c5088a
parentf99a84f7acd17d0db32a92c40955601814d40ccf (diff)
downloadchef-d8641b31bc0c557e10ce4e1dd0856fb61bb3efd5.tar.gz
Update CHANGELOG.md to reflect the promotion of 15.16.7
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 92036bb902..5444330388 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,29 +2,26 @@
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.7 -->
-## [v15.16.7](https://github.com/chef/chef/tree/v15.16.7) (2021-04-02)
-
-#### Merged Pull Requests
-- Fix hab package builds [#11288](https://github.com/chef/chef/pull/11288) ([tas50](https://github.com/tas50))
+<!-- latest_release -->
<!-- latest_release -->
-<!-- release_rollup since=15.16.4 -->
-### Changes not yet released to stable
-
-#### Merged Pull Requests
-- Fix hab package builds [#11288](https://github.com/chef/chef/pull/11288) ([tas50](https://github.com/tas50)) <!-- 15.16.7 -->
-- Bump omnibus-software from `caf6ae0` to `a0e7438` in /omnibus [#11269](https://github.com/chef/chef/pull/11269) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 15.16.6 -->
-- Update readme [#11254](https://github.com/chef/chef/pull/11254) ([tas50](https://github.com/tas50)) <!-- 15.16.5 -->
+<!-- release_rollup -->
<!-- release_rollup -->
<!-- latest_stable_release -->
+## [v15.16.7](https://github.com/chef/chef/tree/v15.16.7) (2021-04-02)
+
+#### Merged Pull Requests
+- Update readme [#11254](https://github.com/chef/chef/pull/11254) ([tas50](https://github.com/tas50))
+- Bump omnibus-software from `caf6ae0` to `a0e7438` in /omnibus [#11269](https://github.com/chef/chef/pull/11269) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot]))
+- Fix hab package builds [#11288](https://github.com/chef/chef/pull/11288) ([tas50](https://github.com/tas50))
+<!-- 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)
diff --git a/Dockerfile b/Dockerfile
index 87e96ff274..cab0c2036e 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.4
+ARG VERSION=15.16.7
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 && \