diff options
author | Chef Expeditor <chef-ci@chef.io> | 2018-09-26 19:18:35 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2018-09-26 19:18:35 +0000 |
commit | 1fe8b7702493a2b2854741a579d3ff5a5a2851ce (patch) | |
tree | 10801360745b530aa697aa50d82bec79607daaf6 | |
parent | b6646065291d040db542f47dba8e1bc5dc57dcb3 (diff) | |
download | chef-1fe8b7702493a2b2854741a579d3ff5a5a2851ce.tar.gz |
Update CHANGELOG.md to reflect the promotion of 13.11.3
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r-- | CHANGELOG.md | 31 | ||||
-rw-r--r-- | Dockerfile | 2 |
2 files changed, 15 insertions, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index db7cd2410f..0c0e08a3c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,25 +1,23 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 13.11.3 --> -## [v13.11.3](https://github.com/chef/chef/tree/v13.11.3) (2018-09-25) - -#### Merged Pull Requests -- osx_profile: Use the full path to /usr/bin/profiles [#7683](https://github.com/chef/chef/pull/7683) ([tas50](https://github.com/tas50)) +<!-- latest_release --> <!-- latest_release --> -<!-- release_rollup since=13.10.4 --> -### Changes since 13.10.4 release - -#### Merged Pull Requests -- osx_profile: Use the full path to /usr/bin/profiles [#7683](https://github.com/chef/chef/pull/7683) ([tas50](https://github.com/tas50)) <!-- 13.11.3 --> -- windows_package: Avoid exposing sensitive data during package install failures if sensitive property set [#7684](https://github.com/chef/chef/pull/7684) ([tas50](https://github.com/tas50)) <!-- 13.11.2 --> -- Fix remote_directory does not obey removal of file specificity [#7687](https://github.com/chef/chef/pull/7687) ([tas50](https://github.com/tas50)) <!-- 13.11.1 --> -- Improve the error message when knife bootstrap windows isn't installed [#7686](https://github.com/chef/chef/pull/7686) ([tas50](https://github.com/tas50)) <!-- 13.11.0 --> -- windows_service: Remove potentially sensitive info from the log [#7688](https://github.com/chef/chef/pull/7688) ([tas50](https://github.com/tas50)) <!-- 13.10.7 --> -- Use the existing helper method for package resource classes that don't support allow_downgrade [#7548](https://github.com/chef/chef/pull/7548) ([tas50](https://github.com/tas50)) <!-- 13.10.6 --> -- Update to openssl 1.0.2p [#7547](https://github.com/chef/chef/pull/7547) ([tas50](https://github.com/tas50)) <!-- 13.10.5 --> +<!-- release_rollup --> <!-- release_rollup --> <!-- latest_stable_release --> +## [v13.11.3](https://github.com/chef/chef/tree/v13.11.3) (2018-09-26) + +#### Merged Pull Requests +- Update to openssl 1.0.2p [#7547](https://github.com/chef/chef/pull/7547) ([tas50](https://github.com/tas50)) +- Use the existing helper method for package resource classes that don't support allow_downgrade [#7548](https://github.com/chef/chef/pull/7548) ([tas50](https://github.com/tas50)) +- windows_service: Remove potentially sensitive info from the log [#7688](https://github.com/chef/chef/pull/7688) ([tas50](https://github.com/tas50)) +- Improve the error message when knife bootstrap windows isn't installed [#7686](https://github.com/chef/chef/pull/7686) ([tas50](https://github.com/tas50)) +- Fix remote_directory does not obey removal of file specificity [#7687](https://github.com/chef/chef/pull/7687) ([tas50](https://github.com/tas50)) +- windows_package: Avoid exposing sensitive data during package install failures if sensitive property set [#7684](https://github.com/chef/chef/pull/7684) ([tas50](https://github.com/tas50)) +- osx_profile: Use the full path to /usr/bin/profiles [#7683](https://github.com/chef/chef/pull/7683) ([tas50](https://github.com/tas50)) +<!-- latest_stable_release --> + ## [v13.10.4](https://github.com/chef/chef/tree/v13.10.4) (2018-08-08) #### Merged Pull Requests @@ -27,7 +25,6 @@ - Backport for 13: scrub tempfile names [#7526](https://github.com/chef/chef/pull/7526) ([tyler-ball](https://github.com/tyler-ball)) - Pin to rspec to < 3.8 [#7528](https://github.com/chef/chef/pull/7528) ([cheeseplus](https://github.com/cheeseplus)) - [SHACK-290] Unpacking tarball paths suffer from URI error [#7522](https://github.com/chef/chef/pull/7522) ([tyler-ball](https://github.com/tyler-ball)) -<!-- latest_stable_release --> ## [v13.10.0](https://github.com/chef/chef/tree/v13.10.0) (2018-07-11) diff --git a/Dockerfile b/Dockerfile index e9ff16668b..85e585033f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM busybox MAINTAINER Chef Software, Inc. <docker@chef.io> ARG CHANNEL=stable -ARG VERSION=13.10.4 +ARG VERSION=13.11.3 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 && \ |