summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10b0b26650..09bc6f0b6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.12.0 -->
-## [v15.12.0](https://github.com/chef/chef/tree/v15.12.0) (2020-06-23)
+<!-- latest_release 15.12.1 -->
+## [v15.12.1](https://github.com/chef/chef/tree/v15.12.1) (2020-06-23)
#### Merged Pull Requests
-- Update Ruby in Expeditor to 2.6.6 [#10034](https://github.com/chef/chef/pull/10034) ([tas50](https://github.com/tas50))
+- hostname: Improve the windows reboot message [#10031](https://github.com/chef/chef/pull/10031) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.11.8 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- hostname: Improve the windows reboot message [#10031](https://github.com/chef/chef/pull/10031) ([tas50](https://github.com/tas50)) <!-- 15.12.1 -->
- Update Ruby in Expeditor to 2.6.6 [#10034](https://github.com/chef/chef/pull/10034) ([tas50](https://github.com/tas50)) <!-- 15.12.0 -->
<!-- release_rollup -->