diff options
| author | Chef Expeditor <expeditor@chef.io> | 2019-11-21 03:56:46 +0000 |
|---|---|---|
| committer | Chef Expeditor <expeditor@chef.io> | 2019-11-21 03:56:46 +0000 |
| commit | 243a7a05a0119f1986532298820186e916889223 (patch) | |
| tree | aeb280baf5b6f075cf549af6e43b2ff60ddc8ba6 | |
| parent | 5d160ea2c26af935eb04a573d7a3f42962e4f569 (diff) | |
| download | chef-243a7a05a0119f1986532298820186e916889223.tar.gz | |
Update CHANGELOG.md to reflect the promotion of 15.5.16
Obvious fix; these changes are the result of automation not creative thinking.
| -rw-r--r-- | CHANGELOG.md | 19 | ||||
| -rw-r--r-- | Dockerfile | 2 |
2 files changed, 9 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index fcd897bcf9..96d67aeafb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,19 +1,17 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 15.5.16 --> -## [v15.5.16](https://github.com/chef/chef/tree/v15.5.16) (2019-11-20) - -#### Merged Pull Requests -- Require relative in the win32-eventlog rakefile [#9116](https://github.com/chef/chef/pull/9116) ([tas50](https://github.com/tas50)) +<!-- latest_release --> <!-- latest_release --> -<!-- release_rollup since=15.5.15 --> -### Changes not yet released to stable - -#### Merged Pull Requests -- Require relative in the win32-eventlog rakefile [#9116](https://github.com/chef/chef/pull/9116) ([tas50](https://github.com/tas50)) <!-- 15.5.16 --> +<!-- release_rollup --> <!-- release_rollup --> <!-- 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) #### Merged Pull Requests @@ -23,7 +21,6 @@ - Remove bonus `.md` to fix link [#9110](https://github.com/chef/chef/pull/9110) ([btm](https://github.com/btm)) - Fix failures in build_essential on rhel platforms [#9111](https://github.com/chef/chef/pull/9111) ([lamont-granquist](https://github.com/lamont-granquist)) - fix enforce_path_sanity being set to true [#9114](https://github.com/chef/chef/pull/9114) ([lamont-granquist](https://github.com/lamont-granquist)) -<!-- latest_stable_release --> ## [v15.5.9](https://github.com/chef/chef/tree/v15.5.9) (2019-11-15) diff --git a/Dockerfile b/Dockerfile index a1a37a548c..c9d1153cfb 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.15 +ARG VERSION=15.5.16 # Allow the build arg below to be controlled by either build arguments ENV VERSION ${EXPEDITOR_VERSION:-${VERSION}} |