diff options
| author | Chef Expeditor <expeditor@chef.io> | 2019-11-21 22:43:20 +0000 |
|---|---|---|
| committer | Chef Expeditor <expeditor@chef.io> | 2019-11-21 22:43:20 +0000 |
| commit | ad3b16dafbd7c27b50f9c447029b35a7b48fb233 (patch) | |
| tree | 5e4cdbc1e25b06172fef52e12784549c01dd5309 | |
| parent | 0cedd8d6952a1565be356d44a95671414f74b684 (diff) | |
| download | chef-ad3b16dafbd7c27b50f9c447029b35a7b48fb233.tar.gz | |
Update CHANGELOG.md to reflect the promotion of 15.5.17
Obvious fix; these changes are the result of automation not creative thinking.
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Dockerfile | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 96d67aeafb..d03e5ea87c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,15 +2,18 @@ <!-- latest_release --> <!-- latest_release --> -<!-- release_rollup --> +<!-- release_rollup since=15.5.17 --> +### Changes not yet released to stable <!-- release_rollup --> <!-- latest_stable_release --> +## [v15.5.17](https://github.com/chef/chef/tree/v15.5.17) (2019-11-21) +<!-- latest_stable_release --> + ## [v15.5.16](https://github.com/chef/chef/tree/v15.5.16) (2019-11-21) #### Merged Pull Requests - Require relative in the win32-eventlog rakefile [#9116](https://github.com/chef/chef/pull/9116) ([tas50](https://github.com/tas50)) -<!-- latest_stable_release --> ## [v15.5.15](https://github.com/chef/chef/tree/v15.5.15) (2019-11-19) diff --git a/Dockerfile b/Dockerfile index c9d1153cfb..2243848e23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ LABEL maintainer="Chef Software, Inc. <docker@chef.io>" ARG EXPEDITOR_CHANNEL ARG CHANNEL=stable ARG EXPEDITOR_VERSION -ARG VERSION=15.5.16 +ARG VERSION=15.5.17 # Allow the build arg below to be controlled by either build arguments ENV VERSION ${EXPEDITOR_VERSION:-${VERSION}} |