diff options
author | Phil Dibowitz <phil@ipom.com> | 2015-06-24 01:32:34 +0100 |
---|---|---|
committer | Phil Dibowitz <phil@ipom.com> | 2015-06-24 01:32:34 +0100 |
commit | 45b56dfc3277f8b0e9ac57d0b5bcd113e4250382 (patch) | |
tree | ea3bdf449cbb4c106c229225e438cf165faad0f6 | |
parent | b864a44aba4dea946667983e774ac37155fe3c26 (diff) | |
parent | 919102c5ea7efe723660059564b59ddbf1b471f0 (diff) | |
download | ohai-45b56dfc3277f8b0e9ac57d0b5bcd113e4250382.tar.gz |
Merge pull request #563 from jaymzh/docs
Fix changelog from merge on PR#559
-rw-r--r-- | CHANGELOG.md | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4de106eb..5f71ef72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,14 @@ # Ohai Changelog ## Unreleased +* [**Phil Dibowitz**](https://github.com/jymzh): + Provide a new and improved filesystem plugin for Linux (filesystem2), to + support CentOS7, multiple virtual filesystes, etc. ## Release 8.5.0 * [PR #548](https://github.com/chef/ohai/548): Coerce non-UTF8 strings to UTF8 in output to suppress UTF8 encoding exceptions -* [**Phil Dibowitz**](https://github.com/jymzh): - Provide a new and improved filesystem plugin for Linux (filesystem2), to - support CentOS7, multiple virtual filesystes, etc. - * [PR #544](https://github.com/chef/ohai/pull/544) add support for Wind River Linux and Cisco's Nexus platforms |