diff options
| author | Chef Expeditor <expeditor@chef.io> | 2020-01-24 17:39:38 +0000 |
|---|---|---|
| committer | Chef Expeditor <expeditor@chef.io> | 2020-01-24 17:39:38 +0000 |
| commit | 07a2e4973c947c83e61f942039e062e1b763a94a (patch) | |
| tree | 2805e100a064aea030c5aab476365c3c3bd6081a | |
| parent | 6a65496ac5310ba1140372c5deedf83cffc5368e (diff) | |
| download | chef-07a2e4973c947c83e61f942039e062e1b763a94a.tar.gz | |
Update CHANGELOG.md to reflect the promotion of 15.7.31
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 cec8f5274c..037b2ded36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,19 +1,17 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 15.7.31 --> -## [v15.7.31](https://github.com/chef/chef/tree/v15.7.31) (2020-01-24) - -#### Merged Pull Requests -- Avoid load method deprecation warnings in knife [#9268](https://github.com/chef/chef/pull/9268) ([tas50](https://github.com/tas50)) +<!-- latest_release --> <!-- latest_release --> -<!-- release_rollup since=15.7.30 --> -### Changes not yet released to stable channel - -#### Merged Pull Requests -- Avoid load method deprecation warnings in knife [#9268](https://github.com/chef/chef/pull/9268) ([tas50](https://github.com/tas50)) <!-- 15.7.31 --> +<!-- release_rollup --> <!-- release_rollup --> <!-- latest_stable_release --> +## [v15.7.31](https://github.com/chef/chef/tree/v15.7.31) (2020-01-24) + +#### Merged Pull Requests +- Avoid load method deprecation warnings in knife [#9268](https://github.com/chef/chef/pull/9268) ([tas50](https://github.com/tas50)) +<!-- latest_stable_release --> + ## [v15.7.30](https://github.com/chef/chef/tree/v15.7.30) (2020-01-23) #### Merged Pull Requests @@ -54,7 +52,6 @@ - launchd: Fix capitalization of HardResourceLimits [#9257](https://github.com/chef/chef/pull/9257) ([tas50](https://github.com/tas50)) - Add Chef::VersionString to Chef::Utils and add windows helpers [#9254](https://github.com/chef/chef/pull/9254) ([tas50](https://github.com/tas50)) - Raises error if there is empty cookbook directory at the time of upload [#9256](https://github.com/chef/chef/pull/9256) ([tas50](https://github.com/tas50)) -<!-- latest_stable_release --> ## [v15.6.10](https://github.com/chef/chef/tree/v15.6.10) (2019-12-12) diff --git a/Dockerfile b/Dockerfile index 0e57aa66aa..149c75bc81 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.7.30 +ARG VERSION=15.7.31 # Allow the build arg below to be controlled by either build arguments ENV VERSION ${EXPEDITOR_VERSION:-${VERSION}} |