summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-26 19:42:23 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-26 19:42:23 +0000
commit2dd9de9143afac54de475d730572897ab4730a06 (patch)
tree97e6cb1d3d2070f7e9d76b426d4bf4c257c894b8
parent8f22c3f980d7d59c81ce416e22c1c420df21d715 (diff)
downloadohai-2dd9de9143afac54de475d730572897ab4730a06.tar.gz
Bump version to 15.0.0 by Chef Expeditorv15.0.0
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md12
1 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1568da55..2240d05c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,17 @@
# Change Log
-<!-- latest_release -->
+<!-- latest_release unreleased -->
+## Unreleased
+
+#### Merged Pull Requests
+- Update master branch for Ohai 15 development [#1277](https://github.com/chef/ohai/pull/1277) ([tas50](https://github.com/tas50))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=14.6.2 -->
+### Changes since 14.6.2 release
+
+#### Merged Pull Requests
+- Update master branch for Ohai 15 development [#1277](https://github.com/chef/ohai/pull/1277) ([tas50](https://github.com/tas50)) <!-- 15.0.0 -->
<!-- release_rollup -->
<!-- latest_stable_release -->