diff options
| author | Chef Expeditor <chef-ci@chef.io> | 2019-05-16 21:37:50 +0000 |
|---|---|---|
| committer | Chef Expeditor <chef-ci@chef.io> | 2019-05-16 21:37:50 +0000 |
| commit | df885a1e35366e6180632741918ab0e774c671a4 (patch) | |
| tree | 9d2ddfe892e1be720ac9c1d2bf6772ff50ab6c82 | |
| parent | 759404194ec79e3e6a360140e646ac44d62d850b (diff) | |
| download | chef-df885a1e35366e6180632741918ab0e774c671a4.tar.gz | |
Update CHANGELOG.md to reflect the promotion of 15.0.300
Obvious fix; these changes are the result of automation not creative thinking.
| -rw-r--r-- | CHANGELOG.md | 12 | ||||
| -rw-r--r-- | Dockerfile | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a6398892fb..f5cad1c903 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,16 +6,21 @@ - Chef Infra Client 15 Release Notes Additional edits [#8543](https://github.com/chef/chef/pull/8543) ([mjingle](https://github.com/mjingle)) <!-- latest_release --> -<!-- release_rollup since=15.0.298 --> +<!-- release_rollup since=15.0.300 --> ### Changes not yet released to rubygems.org #### Merged Pull Requests - Chef Infra Client 15 Release Notes Additional edits [#8543](https://github.com/chef/chef/pull/8543) ([mjingle](https://github.com/mjingle)) <!-- 15.0.301 --> -- Enable pty for bootstrap ssh [#8560](https://github.com/chef/chef/pull/8560) ([marcparadise](https://github.com/marcparadise)) <!-- 15.0.300 --> -- Add license CLI options to chef-apply command [#8554](https://github.com/chef/chef/pull/8554) ([tas50](https://github.com/tas50)) <!-- 15.0.299 --> <!-- release_rollup --> <!-- latest_stable_release --> +## [v15.0.300](https://github.com/chef/chef/tree/v15.0.300) (2019-05-16) + +#### Merged Pull Requests +- Add license CLI options to chef-apply command [#8554](https://github.com/chef/chef/pull/8554) ([tas50](https://github.com/tas50)) +- Enable pty for bootstrap ssh [#8560](https://github.com/chef/chef/pull/8560) ([marcparadise](https://github.com/marcparadise)) +<!-- latest_stable_release --> + ## [v15.0.298](https://github.com/chef/chef/tree/v15.0.298) (2019-05-15) #### Merged Pull Requests @@ -24,7 +29,6 @@ - Bump license-acceptance to 1.0.11 to resolve failures on Windows 2016 [#8551](https://github.com/chef/chef/pull/8551) ([aaronwalker](https://github.com/aaronwalker)) - Multiple Bootstrap bug fixes [#8539](https://github.com/chef/chef/pull/8539) ([marcparadise](https://github.com/marcparadise)) - Bump train-core to 2.1.2 [#8553](https://github.com/chef/chef/pull/8553) ([chef-ci](https://github.com/chef-ci)) -<!-- latest_stable_release --> ## [v15.0.293](https://github.com/chef/chef/tree/v15.0.293) (2019-05-14) diff --git a/Dockerfile b/Dockerfile index 1677afbd60..de20c3647e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ FROM busybox MAINTAINER Chef Software, Inc. <docker@chef.io> ARG CHANNEL=stable -ARG VERSION=15.0.298 +ARG VERSION=15.0.300 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 && \ |