diff options
author | Chef Expeditor <expeditor@chef.io> | 2019-11-19 22:27:39 +0000 |
---|---|---|
committer | Chef Expeditor <expeditor@chef.io> | 2019-11-19 22:27:39 +0000 |
commit | 4e41bec4d3b7f46a3fc496bd5eabf60ad2166d3f (patch) | |
tree | 3f44589dd50538ad068534acd3ce87470c55e587 | |
parent | 8c2b403c6e4fcb9fe91c258d55766f5135f45875 (diff) | |
download | chef-4e41bec4d3b7f46a3fc496bd5eabf60ad2166d3f.tar.gz |
Update CHANGELOG.md to reflect the promotion of 15.5.15
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r-- | CHANGELOG.md | 29 | ||||
-rw-r--r-- | Dockerfile | 2 |
2 files changed, 14 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 15edb36c7b..8b5df99f7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,24 +1,22 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 15.5.15 --> -## [v15.5.15](https://github.com/chef/chef/tree/v15.5.15) (2019-11-19) - -#### Merged Pull Requests -- fix enforce_path_sanity being set to true [#9114](https://github.com/chef/chef/pull/9114) ([lamont-granquist](https://github.com/lamont-granquist)) +<!-- latest_release --> <!-- latest_release --> -<!-- release_rollup since=15.5.9 --> -### Changes not yet released to stable - -#### Merged Pull Requests -- fix enforce_path_sanity being set to true [#9114](https://github.com/chef/chef/pull/9114) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.5.15 --> -- Fix failures in build_essential on rhel platforms [#9111](https://github.com/chef/chef/pull/9111) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.5.14 --> -- Remove bonus `.md` to fix link [#9110](https://github.com/chef/chef/pull/9110) ([btm](https://github.com/btm)) <!-- 15.5.13 --> -- Convert reboot resource to a custom resource with descriptions [#7239](https://github.com/chef/chef/pull/7239) ([tas50](https://github.com/tas50)) <!-- 15.5.12 --> -- Don't ship the extra rake tasks in the gem [#9104](https://github.com/chef/chef/pull/9104) ([tas50](https://github.com/tas50)) <!-- 15.5.11 --> -- Improve input validation on windows_package [#9102](https://github.com/chef/chef/pull/9102) ([tas50](https://github.com/tas50)) <!-- 15.5.10 --> +<!-- release_rollup --> <!-- release_rollup --> <!-- latest_stable_release --> +## [v15.5.15](https://github.com/chef/chef/tree/v15.5.15) (2019-11-19) + +#### Merged Pull Requests +- Improve input validation on windows_package [#9102](https://github.com/chef/chef/pull/9102) ([tas50](https://github.com/tas50)) +- Don't ship the extra rake tasks in the gem [#9104](https://github.com/chef/chef/pull/9104) ([tas50](https://github.com/tas50)) +- Convert reboot resource to a custom resource with descriptions [#7239](https://github.com/chef/chef/pull/7239) ([tas50](https://github.com/tas50)) +- 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) #### Merged Pull Requests @@ -65,7 +63,6 @@ - Bump inspec-core-bin to 4.18.39 [#9098](https://github.com/chef/chef/pull/9098) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) - Improve resource descriptions and the rake task for docs generation [#9097](https://github.com/chef/chef/pull/9097) ([tas50](https://github.com/tas50)) - Add Chef Infra Client 15.5. release notes [#9089](https://github.com/chef/chef/pull/9089) ([tas50](https://github.com/tas50)) -<!-- latest_stable_release --> ## [v15.4.45](https://github.com/chef/chef/tree/v15.4.45) (2019-10-15) diff --git a/Dockerfile b/Dockerfile index 238686f033..a1a37a548c 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.9 +ARG VERSION=15.5.15 # Allow the build arg below to be controlled by either build arguments ENV VERSION ${EXPEDITOR_VERSION:-${VERSION}} |