diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-08-08 20:25:54 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-08-08 20:25:54 +0000 |
| commit | 33ded8a24b0d7e296c583db3767eb27affcebba6 (patch) | |
| tree | 7ffcdd7eb121fdd4a0139516aca929c4a74ba079 | |
| parent | df9127017ed3801770f025a38d2930a2378262f8 (diff) | |
| download | chef-33ded8a24b0d7e296c583db3767eb27affcebba6.tar.gz | |
Update CHANGELOG.md to reflect the promotion of 13.10.4
| -rw-r--r-- | CHANGELOG.md | 25 | ||||
| -rw-r--r-- | Dockerfile | 2 |
2 files changed, 12 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f24dad8c42..131a14fc54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,22 +1,20 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 13.10.4 --> -## [v13.10.4](https://github.com/chef/chef/tree/v13.10.4) (2018-08-07) - -#### Merged Pull Requests -- [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_release --> <!-- latest_release --> -<!-- release_rollup since=13.10.0 --> -### Changes since 13.10.0 release - -#### Merged Pull Requests -- [SHACK-290] Unpacking tarball paths suffer from URI error [#7522](https://github.com/chef/chef/pull/7522) ([tyler-ball](https://github.com/tyler-ball)) <!-- 13.10.4 --> -- Pin to rspec to < 3.8 [#7528](https://github.com/chef/chef/pull/7528) ([cheeseplus](https://github.com/cheeseplus)) <!-- 13.10.3 --> -- Backport for 13: scrub tempfile names [#7526](https://github.com/chef/chef/pull/7526) ([tyler-ball](https://github.com/tyler-ball)) <!-- 13.10.2 --> -- Check local file exists before installing a windows package [#7341](https://github.com/chef/chef/pull/7341) ([josh-barker](https://github.com/josh-barker)) <!-- 13.10.1 --> +<!-- release_rollup --> <!-- release_rollup --> <!-- latest_stable_release --> +## [v13.10.4](https://github.com/chef/chef/tree/v13.10.4) (2018-08-08) + +#### Merged Pull Requests +- Check local file exists before installing a windows package [#7341](https://github.com/chef/chef/pull/7341) ([josh-barker](https://github.com/josh-barker)) +- 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) #### Merged Pull Requests @@ -25,7 +23,6 @@ - Bump Ohai to 13.10.0 [#7438](https://github.com/chef/chef/pull/7438) ([tas50](https://github.com/tas50)) - Backport duplicate logger fix [#7447](https://github.com/chef/chef/pull/7447) ([btm](https://github.com/btm)) - Bump to 13.10 and add release notes [#7454](https://github.com/chef/chef/pull/7454) ([tas50](https://github.com/tas50)) -<!-- latest_stable_release --> ## [v13.9.4](https://github.com/chef/chef/tree/v13.9.4) (2018-06-07) diff --git a/Dockerfile b/Dockerfile index 5836816ed9..e9ff16668b 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.0 +ARG VERSION=13.10.4 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 && \ |