diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-01-14 10:45:26 -0800 |
|---|---|---|
| committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-01-14 10:45:26 -0800 |
| commit | 3abf4668a5f5d8b41684f2ccc744f7c0a9a019e1 (patch) | |
| tree | 213af87305c4ab994089d6360634370fdb5aaccf | |
| parent | 0ae1530e8aba00144aeb22581776df39420e5199 (diff) | |
| parent | c1cd866fe7c7bd3870a40440f8b81a5b2b9d6c30 (diff) | |
| download | ohai-7.4.1.tar.gz | |
Merge pull request #462 from opscode/jdm/7.4.17.4.1
Bump version to 7.4.1
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | lib/ohai/version.rb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a2132007..1e391c71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Ohai Changelog -## Release: 7.6.0 +## Release: 7.4.1 + +* Remove ffi_yajl monkeypatching + +## Release: 7.4.0 * Add Powershell plugin diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb index 4c1ecc87..27777656 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 = '7.4.0' + VERSION = '7.4.1' end |