diff options
| author | Tim Smith <tsmith@chef.io> | 2018-06-04 15:40:39 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-06-04 15:40:39 -0700 |
| commit | 430d0b71e00b075f9a3f073ae7e53e1b2f289153 (patch) | |
| tree | 0d642c8e43c3a7c63f54d88c7258d9a792af8ec5 | |
| parent | a5e9eeff6e4ddc57346c8361d39aa7966e5d3583 (diff) | |
| download | ohai-one_more_time.tar.gz | |
Add back missing changelog entriesone_more_time
Expeditor is smarter than I am. Add these back one more time. After this
we're done with the hand edits forever since things are wired up in both
branches.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | CHANGELOG.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f9316e9e..bf9079eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ #### Merged Pull Requests - Fix an issue caused by using the wrong field in the AIX filesystem plugin [#1199](https://github.com/chef/ohai/pull/1199) ([tas50](https://github.com/tas50)) - Detect virtualization on newer AWS instance types. (m5) [#1201](https://github.com/chef/ohai/pull/1201) ([coderanger](https://github.com/coderanger)) +- [filesystem2] Backport filesystem2 on BSD for Ohai 13 [#1182](https://github.com/chef/ohai/pull/1182) ([jaymzh](https://github.com/jaymzh)) +- Backport "Make the DMI IDs we whitelist configurable" to Ohai 13 [#1194](https://github.com/chef/ohai/pull/1194) ([gsreynolds](https://github.com/gsreynolds)) <!-- latest_stable_release --> ## [v13.9.0](https://github.com/chef/ohai/tree/v13.9.0) (2018-04-09) @@ -729,4 +731,4 @@ - Normalize cloud attributes for Azure (OHAI-554) - Capture FreeBSD osreldate for comparison purposes (OHAI-557) -<http://www.chef.io/blog/2014/04/09/release-chef-client-11-12-2/>
\ No newline at end of file +<http://www.chef.io/blog/2014/04/09/release-chef-client-11-12-2/> |