diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-11-06 23:58:16 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-11-06 23:58:16 +0000 |
| commit | 223d9556f1b98e548f26d1ebe4b8eee5f1c98db2 (patch) | |
| tree | cc6f6930297e0343370f359530ae04280a54b5be | |
| parent | e8ee4f60d3b0e9bc1bda58a3e69506d90ba3d6e1 (diff) | |
| download | chef-223d9556f1b98e548f26d1ebe4b8eee5f1c98db2.tar.gz | |
Update CHANGELOG.md to reflect the promotion of 13.6.4 to stable
| -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 974b9abd5b..7641d8e706 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,22 +1,20 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 13.6.4 --> -## [v13.6.4](https://github.com/chef/chef/tree/v13.6.4) (2017-11-06) - -#### Merged Pull Requests -- Bump openssl and rubygems to latest [#6568](https://github.com/chef/chef/pull/6568) ([tas50](https://github.com/tas50)) +<!-- latest_release --> <!-- latest_release --> -<!-- release_rollup since=13.6.0 --> -### Changes since 13.6.0 release - -#### Merged Pull Requests -- Bump openssl and rubygems to latest [#6568](https://github.com/chef/chef/pull/6568) ([tas50](https://github.com/tas50)) <!-- 13.6.4 --> -- Fix the invalid version comparison of apt packages. [#6554](https://github.com/chef/chef/pull/6554) ([komazarari](https://github.com/komazarari)) <!-- 13.6.3 --> -- Fix the invalid version comparison in apt/dpkg providers [#6558](https://github.com/chef/chef/pull/6558) ([tas50](https://github.com/tas50)) <!-- 13.6.2 --> -- [MSYS-492]Add missing functional tests for users [#6425](https://github.com/chef/chef/pull/6425) ([harikesh-kolekar](https://github.com/harikesh-kolekar)) <!-- 13.6.1 --> +<!-- release_rollup --> <!-- release_rollup --> <!-- latest_stable_release --> +## [v13.6.4](https://github.com/chef/chef/tree/v13.6.4) (2017-11-06) + +#### Merged Pull Requests +- [MSYS-492]Add missing functional tests for users [#6425](https://github.com/chef/chef/pull/6425) ([harikesh-kolekar](https://github.com/harikesh-kolekar)) +- Fix the invalid version comparison in apt/dpkg providers [#6558](https://github.com/chef/chef/pull/6558) ([tas50](https://github.com/tas50)) +- Fix the invalid version comparison of apt packages. [#6554](https://github.com/chef/chef/pull/6554) ([komazarari](https://github.com/komazarari)) +- Bump openssl and rubygems to latest [#6568](https://github.com/chef/chef/pull/6568) ([tas50](https://github.com/tas50)) +<!-- latest_stable_release --> + ## [v13.6.0](https://github.com/chef/chef/tree/v13.6.0) (2017-10-30) #### Merged Pull Requests @@ -44,7 +42,6 @@ - Include Ohai 13.6 [#6521](https://github.com/chef/chef/pull/6521) ([btm](https://github.com/btm)) - Use the latest libxml2, libxslt, libyaml, and openssl [#6520](https://github.com/chef/chef/pull/6520) ([tas50](https://github.com/tas50)) - Pull in the latest libiconv and nokogiri [#6532](https://github.com/chef/chef/pull/6532) ([tas50](https://github.com/tas50)) -<!-- latest_stable_release --> ## [v13.5.3](https://github.com/chef/chef/tree/v13.5.3) (2017-10-03) diff --git a/Dockerfile b/Dockerfile index 1505422358..4b3c3f5e67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM busybox MAINTAINER Chef Software, Inc. <docker@chef.io> ARG CHANNEL=stable -ARG VERSION=13.6.0 +ARG VERSION=13.6.4 RUN wget "http://packages.chef.io/files/${CHANNEL}/chef/${VERSION}/el/5/chef-${VERSION}-1.el5.x86_64.rpm" -O /tmp/chef-client.rpm && \ rpm2cpio /tmp/chef-client.rpm | cpio -idmv && \ |