diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-09-25 17:07:56 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-09-25 17:07:56 +0000 |
commit | 1c4217d0f97d6c6cfe46a9d373898ff9ecb8a76f (patch) | |
tree | 0747279ace2ec4ee6b00887b6065f5fa786f43d1 | |
parent | 30ae8c51dee9e281509f126ef44612f7cf5d8ab6 (diff) | |
download | chef-1c4217d0f97d6c6cfe46a9d373898ff9ecb8a76f.tar.gz |
Update CHANGELOG.md to reflect the promotion of 14.5.33
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r-- | CHANGELOG.md | 29 | ||||
-rw-r--r-- | Dockerfile | 2 |
2 files changed, 14 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 293c9a1bb9..b8a16674e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,24 +1,22 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.5.33 --> -## [v14.5.33](https://github.com/chef/chef/tree/v14.5.33) (2018-09-22) - -#### Merged Pull Requests -- Update to the latest omnibus-software for builds [#7676](https://github.com/chef/chef/pull/7676) ([tas50](https://github.com/tas50)) +<!-- latest_release --> <!-- latest_release --> -<!-- release_rollup since=14.5.27 --> -### Changes since 14.5.27 release - -#### Merged Pull Requests -- Update to the latest omnibus-software for builds [#7676](https://github.com/chef/chef/pull/7676) ([tas50](https://github.com/tas50)) <!-- 14.5.33 --> -- Fix failures in windows_ad_join in 14.5.27 [#7673](https://github.com/chef/chef/pull/7673) ([tas50](https://github.com/tas50)) <!-- 14.5.32 --> -- Deprecate ohai resource's ohai_name property [#7667](https://github.com/chef/chef/pull/7667) ([tas50](https://github.com/tas50)) <!-- 14.5.31 --> -- Add @jjlimepoint as a maintainer for chef-provisioning [#7649](https://github.com/chef/chef/pull/7649) ([jjlimepoint](https://github.com/jjlimepoint)) <!-- 14.5.30 --> -- windows_feature: Fix exception message grammar [#7669](https://github.com/chef/chef/pull/7669) ([dgreeninger](https://github.com/dgreeninger)) <!-- 14.5.29 --> -- windows_service: Remove potentially sensitive info from the log [#7659](https://github.com/chef/chef/pull/7659) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.5.28 --> +<!-- release_rollup --> <!-- release_rollup --> <!-- latest_stable_release --> +## [v14.5.33](https://github.com/chef/chef/tree/v14.5.33) (2018-09-25) + +#### Merged Pull Requests +- windows_service: Remove potentially sensitive info from the log [#7659](https://github.com/chef/chef/pull/7659) ([stuartpreston](https://github.com/stuartpreston)) +- windows_feature: Fix exception message grammar [#7669](https://github.com/chef/chef/pull/7669) ([dgreeninger](https://github.com/dgreeninger)) +- Add @jjlimepoint as a maintainer for chef-provisioning [#7649](https://github.com/chef/chef/pull/7649) ([jjlimepoint](https://github.com/jjlimepoint)) +- Deprecate ohai resource's ohai_name property [#7667](https://github.com/chef/chef/pull/7667) ([tas50](https://github.com/tas50)) +- Fix failures in windows_ad_join in 14.5.27 [#7673](https://github.com/chef/chef/pull/7673) ([tas50](https://github.com/tas50)) +- Update to the latest omnibus-software for builds [#7676](https://github.com/chef/chef/pull/7676) ([tas50](https://github.com/tas50)) +<!-- latest_stable_release --> + ## [v14.5.27](https://github.com/chef/chef/tree/v14.5.27) (2018-09-20) #### Merged Pull Requests @@ -57,7 +55,6 @@ - Update script resource deprecation waring [#7651](https://github.com/chef/chef/pull/7651) ([tas50](https://github.com/tas50)) - Remove Bryant Lippert as a FreeBSD maintainer [#7654](https://github.com/chef/chef/pull/7654) ([tas50](https://github.com/tas50)) - Wire up openssl_x509 [#7660](https://github.com/chef/chef/pull/7660) ([tas50](https://github.com/tas50)) -<!-- latest_stable_release --> ## [v14.4.56](https://github.com/chef/chef/tree/v14.4.56) (2018-08-29) diff --git a/Dockerfile b/Dockerfile index c28071861d..af29f60055 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM busybox MAINTAINER Chef Software, Inc. <docker@chef.io> ARG CHANNEL=stable -ARG VERSION=14.5.27 +ARG VERSION=14.5.33 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 && \ |