Merge pull request #775 from chef/8_12_1

release 8.12.1
chef · Mar 15, 2016 · 80c91e7 · 80c91e7
2 parents b813c8f + c02016e
commit 80c91e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## [8.12.1](https://github.com/chef/ohai/tree/8.12.1) (2016-03-14)
+[Full Changelog](https://github.com/chef/ohai/compare/v8.12.0...8.12.1)
+
+**Fixed bugs:**
+
+- Fix gem conflicts in ruby environments that load rake 11 [\#774](https://github.com/chef/ohai/pull/774) ([danielsdeleo](https://github.com/danielsdeleo))
+
 ## [8.12.0](https://github.com/chef/ohai/tree/8.12.0) (2016-03-09)
 [Full Changelog](https://github.com/chef/ohai/compare/v8.11.1...8.12.0)
 

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.12.0"
+  VERSION = "8.12.1"
 end