summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-01-17 23:54:12 +0000
committerChef Expeditor <expeditor@chef.io>2020-01-17 23:54:12 +0000
commit168f4adfaa918c3ec2acc4b9cd62d50e5f20c30b (patch)
tree3c3a70467724eacf6708a0ca0c0399e0a1e30557 /CHANGELOG.md
parent1305263da8eeec87bcb3416d94b84c164831f590 (diff)
downloadchef-168f4adfaa918c3ec2acc4b9cd62d50e5f20c30b.tar.gz
Bump version to 15.7.25 by Chef Expeditorv15.7.25
Obvious fix; these changes are the result of automation not creative thinking.
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 1f99847f1c..6e4dbfea2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.7.24 -->
-## [v15.7.24](https://github.com/chef/chef/tree/v15.7.24) (2020-01-17)
+<!-- latest_release 15.7.25 -->
+## [v15.7.25](https://github.com/chef/chef/tree/v15.7.25) (2020-01-17)
#### Merged Pull Requests
-- Prep the chef-15 branch to build stable releases [#9236](https://github.com/chef/chef/pull/9236) ([tas50](https://github.com/tas50))
+- Point at the 15-stable ohai branch [#9240](https://github.com/chef/chef/pull/9240) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.6.10 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Point at the 15-stable ohai branch [#9240](https://github.com/chef/chef/pull/9240) ([tas50](https://github.com/tas50)) <!-- 15.7.25 -->
- Prep the chef-15 branch to build stable releases [#9236](https://github.com/chef/chef/pull/9236) ([tas50](https://github.com/tas50)) <!-- 15.7.24 -->
- Remove RHEL 6 s390x (zLinux) support [#9233](https://github.com/chef/chef/pull/9233) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 15.7.23 -->
- Add time_out property in cron resource [#9153](https://github.com/chef/chef/pull/9153) ([Nimesh-Msys](https://github.com/Nimesh-Msys)) <!-- 15.7.22 -->