Merge pull request #910 from chef/8.22.0v8.22.0

Release 8.22.0

4 files changed, 40 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 425b8050..b16575a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,28 @@
 # Change Log
 
-## [8.21.0](https://github.com/chef/ohai/tree/8.21.0) (2016-10-16)
+## [8.22.0](https://github.com/chef/ohai/tree/8.22.0) (2016-11-30)
+[Full Changelog](https://github.com/chef/ohai/compare/v8.21.0...8.22.0)
 
-[Full Changelog](https://github.com/chef/ohai/compare/v8.20.0...8.21.0)
+**Implemented enhancements:**
+
+- Detect the global zone of a Solaris system as a virt host even without guests [\#908](https://github.com/chef/ohai/pull/908) ([numericillustration](https://github.com/numericillustration))
+- Add new haskell language plugin [\#902](https://github.com/chef/ohai/pull/902) ([cdituri](https://github.com/cdituri))
+- Better handle errors in fetching the hostname on darwin \(macOS\) systems [\#884](https://github.com/chef/ohai/pull/884) ([erikng](https://github.com/erikng))
+- Prefer lsb\_release tool to /etc/lsb-release data [\#873](https://github.com/chef/ohai/pull/873) ([kylev](https://github.com/kylev))
+- Extend set\_attribute plugin helper method to set sub-attributes. [\#822](https://github.com/chef/ohai/pull/822) ([mcquin](https://github.com/mcquin))
+
+**Fixed bugs:**
+
+- Rework / fix logic in the joyent plugin and improve specs [\#909](https://github.com/chef/ohai/pull/909) ([tas50](https://github.com/tas50))
+- Avoid  ip\_scopes returning tunl/docker interfaces as privateaddress [\#890](https://github.com/chef/ohai/pull/890) ([n-marton](https://github.com/n-marton))
+
+## [v8.21.0](https://github.com/chef/ohai/tree/v8.21.0) (2016-10-18)
+
+[Full Changelog](https://github.com/chef/ohai/compare/v8.20.0...v8.21.0)
 
 **Implemented enhancements:**
 
-- Add a new shard plugin [#877](https://github.com/chef/ohai/pull/877) ([jaymzh](https://github.com/jaymzh))
+- Add shard plugin [#877](https://github.com/chef/ohai/pull/877) ([jaymzh](https://github.com/jaymzh))
 
 **Fixed bugs:**
 
diff --git a/OHAI_MVPS.md b/OHAI_MVPS.md
index cd4a3c20..fb7c6b5b 100644
--- a/OHAI_MVPS.md
+++ b/OHAI_MVPS.md
@@ -12,6 +12,7 @@ The [MVP list](https://github.com/opscode/chef/blob/master/CHEF_MVPS.md) is kept
 
 | Release | Date | MVP |
 |---------|------|-----|
+| Ohai 8.22.0 | 2016-11-30 | Chris Dituri |
 | Ohai 8.21.0 | 2016-10-18 | Phil Dibowitz |
 | Ohai 8.20.0 | 2016-09-07 | Davide Cavalca |
 | Ohai 8.19.0 | 2016-08-11 | Jere Julian |
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index b108adf7..58db5409 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -8,3 +8,22 @@ Details about the thing that changed that needs to get included in the Release N
 -->
 
 # Ohai Release Notes:
+
+## Haskell Language plugin
+
+Haskell is now detected in a new haskell language plugin:
+
+```javascript
+"languages": {
+  "haskell": {
+    "stack": {
+      "version": "1.2.0",
+      "description": "Version 1.2.0 x86_64 hpack-0.14.0"
+    }
+  }
+}
+```
+
+## LSB Release Detection
+
+The lsb_release command line tool is now preferred to the contents of /etc/lsb-release. This resolves an issue where a distro can be upgraded, but /etc/lsb-release is not upgraded to reflect the change
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 3bc853cf..c2a964c5 100644
--- 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.21.0"
+  VERSION = "8.22.0"
 end