diff options
author | Matt Wrock <matt@mattwrock.com> | 2016-03-15 08:58:30 -0700 |
---|---|---|
committer | Matt Wrock <matt@mattwrock.com> | 2016-03-15 08:58:30 -0700 |
commit | 80c91e74ac403959d54c9f15b1aa7a3c4fc4bd8b (patch) | |
tree | de96eb01bdfb103502873f4e7e429e052e4749cb | |
parent | b813c8f26d4619c9d3e961db84de01f0011b96b2 (diff) | |
parent | c02016e8f97325b49dc2bcf44fb7e5edbc797f86 (diff) | |
download | ohai-80c91e74ac403959d54c9f15b1aa7a3c4fc4bd8b.tar.gz |
Merge pull request #775 from chef/8_12_1v8.12.1
release 8.12.1
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | lib/ohai/version.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f8c6886c..40a9a3be 100644 --- 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 index 4fcdef6c..b4413ecb 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.12.0" + VERSION = "8.12.1" end |