summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-01-30 00:31:05 +0000
committerChef Expeditor <chef-ci@chef.io>2019-01-30 00:31:05 +0000
commit0773dfdb8b2d5f9a60057ececac5f1738d041ea5 (patch)
treea053ad79443f62fbf8b28d76f9d33861ca28459e
parentc11cd22b894b477de2125e88af28f5eb031dbada (diff)
downloadchef-0773dfdb8b2d5f9a60057ececac5f1738d041ea5.tar.gz
Update CHANGELOG.md to reflect the promotion of 14.10.9
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md39
-rw-r--r--Dockerfile2
2 files changed, 19 insertions, 22 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1998997d2..d1e6dff544 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,29 +1,27 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.10.9 -->
-## [v14.10.9](https://github.com/chef/chef/tree/v14.10.9) (2019-01-29)
-
-#### Merged Pull Requests
-- Bump InSpec to 3.4.1 [#8192](https://github.com/chef/chef/pull/8192) ([tas50](https://github.com/tas50))
+<!-- latest_release -->
<!-- latest_release -->
-<!-- release_rollup since=14.9.13 -->
-### Changes since 14.9.13 release
-
-#### Merged Pull Requests
-- Bump InSpec to 3.4.1 [#8192](https://github.com/chef/chef/pull/8192) ([tas50](https://github.com/tas50)) <!-- 14.10.9 -->
-- Backport git resource fix in #8179 and update win32-certstore [#8189](https://github.com/chef/chef/pull/8189) ([tas50](https://github.com/tas50)) <!-- 14.10.8 -->
-- Officially deprecate cookbook shadowing and audit mode [#8187](https://github.com/chef/chef/pull/8187) ([tas50](https://github.com/tas50)) <!-- 14.10.7 -->
-- Update inspec to 3.3.14 [#8185](https://github.com/chef/chef/pull/8185) ([tas50](https://github.com/tas50)) <!-- 14.10.6 -->
-- apt_repository: Don&#39;t create gpg temporary files owned by root in the running user&#39;s home directory [#8184](https://github.com/chef/chef/pull/8184) ([tas50](https://github.com/tas50)) <!-- 14.10.5 -->
-- Cleanup dependencies and comments in knife plugins [#8183](https://github.com/chef/chef/pull/8183) ([tas50](https://github.com/tas50)) <!-- 14.10.4 -->
-- Bump all deps to current [#8173](https://github.com/chef/chef/pull/8173) ([tas50](https://github.com/tas50)) <!-- 14.10.3 -->
-- Update nokogiri to 1.10.1 [#8172](https://github.com/chef/chef/pull/8172) ([tas50](https://github.com/tas50)) <!-- 14.10.2 -->
-- Add a deprecation warning to knife cookbook site [#8164](https://github.com/chef/chef/pull/8164) ([tas50](https://github.com/tas50)) <!-- 14.10.1 -->
-- windows_certificate: Ensure all actions are fully idempotent [#8163](https://github.com/chef/chef/pull/8163) ([tas50](https://github.com/tas50)) <!-- 14.10.0 -->
-- Bump all deps to the latest versions [#8154](https://github.com/chef/chef/pull/8154) ([tas50](https://github.com/tas50)) <!-- 14.9.14 -->
+<!-- release_rollup -->
<!-- release_rollup -->
<!-- latest_stable_release -->
+## [v14.10.9](https://github.com/chef/chef/tree/v14.10.9) (2019-01-30)
+
+#### Merged Pull Requests
+- Bump all deps to the latest versions [#8154](https://github.com/chef/chef/pull/8154) ([tas50](https://github.com/tas50))
+- windows_certificate: Ensure all actions are fully idempotent [#8163](https://github.com/chef/chef/pull/8163) ([tas50](https://github.com/tas50))
+- Add a deprecation warning to knife cookbook site [#8164](https://github.com/chef/chef/pull/8164) ([tas50](https://github.com/tas50))
+- Update nokogiri to 1.10.1 [#8172](https://github.com/chef/chef/pull/8172) ([tas50](https://github.com/tas50))
+- Bump all deps to current [#8173](https://github.com/chef/chef/pull/8173) ([tas50](https://github.com/tas50))
+- Cleanup dependencies and comments in knife plugins [#8183](https://github.com/chef/chef/pull/8183) ([tas50](https://github.com/tas50))
+- apt_repository: Don&#39;t create gpg temporary files owned by root in the running user&#39;s home directory [#8184](https://github.com/chef/chef/pull/8184) ([tas50](https://github.com/tas50))
+- Update inspec to 3.3.14 [#8185](https://github.com/chef/chef/pull/8185) ([tas50](https://github.com/tas50))
+- Officially deprecate cookbook shadowing and audit mode [#8187](https://github.com/chef/chef/pull/8187) ([tas50](https://github.com/tas50))
+- Backport git resource fix in #8179 and update win32-certstore [#8189](https://github.com/chef/chef/pull/8189) ([tas50](https://github.com/tas50))
+- Bump InSpec to 3.4.1 [#8192](https://github.com/chef/chef/pull/8192) ([tas50](https://github.com/tas50))
+<!-- latest_stable_release -->
+
## [v14.9.13](https://github.com/chef/chef/tree/v14.9.13) (2019-01-22)
#### Merged Pull Requests
@@ -52,7 +50,6 @@
- Allow for mixlib-archive 1.x [#8141](https://github.com/chef/chef/pull/8141) ([tas50](https://github.com/tas50))
- systctl: Allow slashes in key or block name [#8142](https://github.com/chef/chef/pull/8142) ([tas50](https://github.com/tas50))
- homebrew_cask: Ensure the resource is fully idempotent [#8143](https://github.com/chef/chef/pull/8143) ([tas50](https://github.com/tas50))
-<!-- latest_stable_release -->
## [v14.8.12](https://github.com/chef/chef/tree/v14.8.12) (2018-12-13)
diff --git a/Dockerfile b/Dockerfile
index 58ce3c38d4..50d6b1cf0d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM busybox
MAINTAINER Chef Software, Inc. <docker@chef.io>
ARG CHANNEL=stable
-ARG VERSION=14.9.13
+ARG VERSION=14.10.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 && \