summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-31 17:53:18 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-31 17:53:18 +0000
commitd4a255a7525a4ac426d3ddd4655c6edf4053c781 (patch)
tree43b8ad5182f412b148412016c7a4767e9bf3300f /CHANGELOG.md
parent771ad63d3d7fc9d95f7cfc5a466f1b430e14182f (diff)
downloadchef-d4a255a7525a4ac426d3ddd4655c6edf4053c781.tar.gz
Bump version to 14.1.25 by Chef Expeditorv14.1.25
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 5b54d5f4d7..20de381b1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.1.24 -->
-## [v14.1.24](https://github.com/chef/chef/tree/v14.1.24) (2018-05-31)
+<!-- latest_release 14.1.25 -->
+## [v14.1.25](https://github.com/chef/chef/tree/v14.1.25) (2018-05-31)
#### Merged Pull Requests
-- Properly print path to config file to the screen in knife configure [#7325](https://github.com/chef/chef/pull/7325) ([tas50](https://github.com/tas50))
+- windows_ad_join: Ensure that reboot requests work [#7328](https://github.com/chef/chef/pull/7328) ([thommay](https://github.com/thommay))
<!-- latest_release -->
<!-- release_rollup since=14.1.12 -->
### Changes since 14.1.12 release
#### Merged Pull Requests
+- windows_ad_join: Ensure that reboot requests work [#7328](https://github.com/chef/chef/pull/7328) ([thommay](https://github.com/thommay)) <!-- 14.1.25 -->
- Properly print path to config file to the screen in knife configure [#7325](https://github.com/chef/chef/pull/7325) ([tas50](https://github.com/tas50)) <!-- 14.1.24 -->
- add default_env flag to shell_out and execute resource [#7298](https://github.com/chef/chef/pull/7298) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.1.23 -->
- Cookbook Version: add host-&lt;fqdn&gt; to the error message for templates and files specificity [#7295](https://github.com/chef/chef/pull/7295) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.1.22 -->