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 4e1501c08e..82bb8c6477 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.10.11 -->
-## [v15.10.11](https://github.com/chef/chef/tree/v15.10.11) (2020-04-21)
+<!-- latest_release 15.10.12 -->
+## [v15.10.12](https://github.com/chef/chef/tree/v15.10.12) (2020-04-21)
#### Merged Pull Requests
-- Update omnibus-software to resolve shipping 2 copies of pry [#9701](https://github.com/chef/chef/pull/9701) ([tas50](https://github.com/tas50))
+- Update Ohai to 15.9 [#9707](https://github.com/chef/chef/pull/9707) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.9.17 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update Ohai to 15.9 [#9707](https://github.com/chef/chef/pull/9707) ([tas50](https://github.com/tas50)) <!-- 15.10.12 -->
- Update omnibus-software to resolve shipping 2 copies of pry [#9701](https://github.com/chef/chef/pull/9701) ([tas50](https://github.com/tas50)) <!-- 15.10.11 -->
- Remove &quot;Code Can&quot; from dmg background [#9702](https://github.com/chef/chef/pull/9702) ([tas50](https://github.com/tas50)) <!-- 15.10.10 -->
- Produce aarch64 Amazon Linux 2 packages [#9680](https://github.com/chef/chef/pull/9680) ([tas50](https://github.com/tas50)) <!-- 15.10.9 -->