summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-04-20 01:09:46 +0000
committerChef Expeditor <chef-ci@chef.io>2019-04-20 01:09:46 +0000
commit7576b2e32a58668eed0ddf2d687e82651d46db04 (patch)
tree914a0ba8ecfc4b74673c5a527f235625fb3cbe2f
parentd7f6591e30eb52f0ba8f274664621e0991503dde (diff)
downloadchef-7576b2e32a58668eed0ddf2d687e82651d46db04.tar.gz
Update CHANGELOG.md to reflect the promotion of 14.12.9
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md29
-rw-r--r--Dockerfile2
2 files changed, 14 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3307b42e83..1073cf3244 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,24 +1,22 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.12.9 -->
-## [v14.12.9](https://github.com/chef/chef/tree/v14.12.9) (2019-04-19)
-
-#### Merged Pull Requests
-- Sync the CLI option descriptions between chef-client and chef-solo [#8402](https://github.com/chef/chef/pull/8402) ([tas50](https://github.com/tas50))
+<!-- latest_release -->
<!-- latest_release -->
-<!-- release_rollup since=14.12.3 -->
-### Changes since 14.12.3 release
-
-#### Merged Pull Requests
-- Sync the CLI option descriptions between chef-client and chef-solo [#8402](https://github.com/chef/chef/pull/8402) ([tas50](https://github.com/tas50)) <!-- 14.12.9 -->
-- Improve the error message when no config can be loaded [#8401](https://github.com/chef/chef/pull/8401) ([tas50](https://github.com/tas50)) <!-- 14.12.8 -->
-- Fix default/override attribute blacklists and whitelists [#8400](https://github.com/chef/chef/pull/8400) ([tas50](https://github.com/tas50)) <!-- 14.12.7 -->
-- Add placeholder license acceptance flags [#8398](https://github.com/chef/chef/pull/8398) ([tas50](https://github.com/tas50)) <!-- 14.12.6 -->
-- Update win32-service + bump inspec to 3.9.3 [#8387](https://github.com/chef/chef/pull/8387) ([tas50](https://github.com/tas50)) <!-- 14.12.5 -->
-- Backport #8077 to Chef 14 [#8384](https://github.com/chef/chef/pull/8384) ([btm](https://github.com/btm)) <!-- 14.12.4 -->
+<!-- release_rollup -->
<!-- release_rollup -->
<!-- latest_stable_release -->
+## [v14.12.9](https://github.com/chef/chef/tree/v14.12.9) (2019-04-20)
+
+#### Merged Pull Requests
+- Backport #8077 to Chef 14 [#8384](https://github.com/chef/chef/pull/8384) ([btm](https://github.com/btm))
+- Update win32-service + bump inspec to 3.9.3 [#8387](https://github.com/chef/chef/pull/8387) ([tas50](https://github.com/tas50))
+- Add placeholder license acceptance flags [#8398](https://github.com/chef/chef/pull/8398) ([tas50](https://github.com/tas50))
+- Fix default/override attribute blacklists and whitelists [#8400](https://github.com/chef/chef/pull/8400) ([tas50](https://github.com/tas50))
+- Improve the error message when no config can be loaded [#8401](https://github.com/chef/chef/pull/8401) ([tas50](https://github.com/tas50))
+- Sync the CLI option descriptions between chef-client and chef-solo [#8402](https://github.com/chef/chef/pull/8402) ([tas50](https://github.com/tas50))
+<!-- latest_stable_release -->
+
## [v14.12.3](https://github.com/chef/chef/tree/v14.12.3) (2019-04-16)
#### Merged Pull Requests
@@ -30,7 +28,6 @@
- Update Ruby to 2.5.5 and nokogiri to 1.10.2 [#8339](https://github.com/chef/chef/pull/8339) ([tas50](https://github.com/tas50))
- Backport two test fixes/changes to chef-14 [#8364](https://github.com/chef/chef/pull/8364) ([btm](https://github.com/btm))
- Drop privileges before creating files in solo mode [#8372](https://github.com/chef/chef/pull/8372) ([btm](https://github.com/btm))
-<!-- latest_stable_release -->
## [v14.11.21](https://github.com/chef/chef/tree/v14.11.21) (2019-03-07)
diff --git a/Dockerfile b/Dockerfile
index 8f2d4baa2b..7d6ba4ec3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM busybox
MAINTAINER Chef Software, Inc. <docker@chef.io>
ARG CHANNEL=stable
-ARG VERSION=14.12.3
+ARG VERSION=14.12.9
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 && \