diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-09-14 19:36:19 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-09-14 19:36:19 +0000 |
| commit | fe65320e7d009cd8822b9060ff910c57766693ec (patch) | |
| tree | b64cc94249216513ceaa70fca8dee81f83a74d25 | |
| parent | 3fae09bbfe56e8b8112daf6d6c5b8a1707d924c2 (diff) | |
| download | chef-fe65320e7d009cd8822b9060ff910c57766693ec.tar.gz | |
Update CHANGELOG.md to reflect the promotion of 13.4.24 to stable
| -rw-r--r-- | CHANGELOG.md | 20 | ||||
| -rw-r--r-- | Dockerfile | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index fa0ede7e51..6d5dbdcf59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,17 +6,20 @@ - Use ruby 2.4.2 to addess multiple security vulnerabilities [#6404](https://github.com/chef/chef/pull/6404) ([thommay](https://github.com/thommay)) <!-- latest_release --> -<!-- release_rollup since=13.4.19 --> -### Changes since 13.4.19 release - -#### Merged Pull Requests -- Use ruby 2.4.2 to addess multiple security vulnerabilities [#6404](https://github.com/chef/chef/pull/6404) ([thommay](https://github.com/thommay)) <!-- 13.4.23 --> -- Allow specifying default gateway on RHEL/Centos [#6386](https://github.com/chef/chef/pull/6386) ([tomdoherty](https://github.com/tomdoherty)) <!-- 13.4.20 --> -- [MSYS-594] windows_task resource is not idempotent when specifying start_time and start_day [#6312](https://github.com/chef/chef/pull/6312) ([harikesh-kolekar](https://github.com/harikesh-kolekar)) <!-- 13.4.21 --> -- MSYS-656 - fixed dsc_script for WMF5 [#6383](https://github.com/chef/chef/pull/6383) ([piyushawasthi](https://github.com/piyushawasthi)) <!-- 13.4.22 --> +<!-- release_rollup since=13.4.24 --> +### Changes since 13.4.24 release <!-- release_rollup --> <!-- latest_stable_release --> +## [v13.4.24](https://github.com/chef/chef/tree/v13.4.24) (2017-09-14) + +#### Merged Pull Requests +- MSYS-656 - fixed dsc_script for WMF5 [#6383](https://github.com/chef/chef/pull/6383) ([piyushawasthi](https://github.com/piyushawasthi)) +- [MSYS-594] windows_task resource is not idempotent when specifying start_time and start_day [#6312](https://github.com/chef/chef/pull/6312) ([harikesh-kolekar](https://github.com/harikesh-kolekar)) +- Allow specifying default gateway on RHEL/Centos [#6386](https://github.com/chef/chef/pull/6386) ([tomdoherty](https://github.com/tomdoherty)) +- Use ruby 2.4.2 to addess multiple security vulnerabilities [#6404](https://github.com/chef/chef/pull/6404) ([thommay](https://github.com/thommay)) +<!-- latest_stable_release --> + ## [v13.4.19](https://github.com/chef/chef/tree/v13.4.19) (2017-09-13) #### Bug Fixes @@ -40,7 +43,6 @@ - Alternate user local logon authentication for remote_file resource [#5832](https://github.com/chef/chef/pull/5832) ([NimishaS](https://github.com/NimishaS)) - Add support for specifying ETHTOOL_OPTS in the ifconfig resource [#6384](https://github.com/chef/chef/pull/6384) ([tomdoherty](https://github.com/tomdoherty)) - Cleanup the current changelog [#6387](https://github.com/chef/chef/pull/6387) ([tas50](https://github.com/tas50)) -<!-- latest_stable_release --> ## [v13.3.42](https://github.com/chef/chef/tree/v13.3.42) (2017-08-16) diff --git a/Dockerfile b/Dockerfile index d5ffd4e5ed..2e32d2e452 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM busybox MAINTAINER Chef Software, Inc. <docker@chef.io> ARG CHANNEL=stable -ARG VERSION=13.4.19 +ARG VERSION=13.4.24 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 && \ |