summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-11 17:57:22 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-11 17:57:22 +0000
commit7fd58aee79646f4db574033d761bbee81c54f1fc (patch)
tree89f9c47eb3217b11c0badcfec61ac0f5897ef5a4 /CHANGELOG.md
parent2b81977a15e80f98864a25c54a063b4994795033 (diff)
downloadchef-7fd58aee79646f4db574033d761bbee81c54f1fc.tar.gz
Bump version to 14.6.21 by Chef Expeditorv14.6.21
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 70a5fec660..578a4004ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.6.20 -->
-## [v14.6.20](https://github.com/chef/chef/tree/v14.6.20) (2018-10-11)
+<!-- latest_release 14.6.21 -->
+## [v14.6.21](https://github.com/chef/chef/tree/v14.6.21) (2018-10-11)
#### Merged Pull Requests
-- Bump win32-taskscheduler to 1.0.12 [#7740](https://github.com/chef/chef/pull/7740) ([chef-ci](https://github.com/chef-ci))
+- Bump ohai to 14.6.2 [#7742](https://github.com/chef/chef/pull/7742) ([chef-ci](https://github.com/chef-ci))
<!-- latest_release -->
<!-- release_rollup since=14.5.33 -->
### Changes since 14.5.33 release
#### Merged Pull Requests
+- Bump ohai to 14.6.2 [#7742](https://github.com/chef/chef/pull/7742) ([chef-ci](https://github.com/chef-ci)) <!-- 14.6.21 -->
- Bump win32-taskscheduler to 1.0.12 [#7740](https://github.com/chef/chef/pull/7740) ([chef-ci](https://github.com/chef-ci)) <!-- 14.6.20 -->
- Enable x86_64-linux-kernel2 habitat builds for chef-client [#7722](https://github.com/chef/chef/pull/7722) ([smacfarlane](https://github.com/smacfarlane)) <!-- 14.6.19 -->
- Add the timezone resource from the timezone_lwrp cookbook [#7736](https://github.com/chef/chef/pull/7736) ([tas50](https://github.com/tas50)) <!-- 14.6.18 -->