Merge pull request #562 from chef/jdm/8.5.0

Release Ohai 8.5.0
chef · Jun 23, 2015 · 5c166cf · 5c166cf
2 parents ee5c24e + 0eee7f3
commit 5c166cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,14 @@
 
 ## Unreleased
 
+## 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
 
+* [PR #544](https://github.com/chef/ohai/pull/544)
+  add support for Wind River Linux and Cisco's Nexus platforms
+
 ## Release 8.4.0
 
 * Correctly skip unwanted DMI information

diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '8.4.0'
+  VERSION = '8.5.0'
 end