diff options
| author | lamont-granquist <lamont@scriptkiddie.org> | 2014-07-07 13:25:32 -0700 |
|---|---|---|
| committer | lamont-granquist <lamont@scriptkiddie.org> | 2014-07-07 13:25:32 -0700 |
| commit | 8f717cec19e901a7c42d3d7da7203cdf53150e56 (patch) | |
| tree | e42c6534771900ece1d3478e70a9fa0b9f334ec2 | |
| parent | fd7b5a1f8b653af938642f354216523bd3e3e3b9 (diff) | |
| parent | 55b101803ce7bd5248c557f46e4cf96020b42c33 (diff) | |
| download | ohai-8f717cec19e901a7c42d3d7da7203cdf53150e56.tar.gz | |
Merge pull request #358 from opscode/lcg/add-json-compat
add Object#to_json monkeypatches
| -rw-r--r-- | lib/ohai/hints.rb | 2 | ||||
| -rw-r--r-- | lib/ohai/system.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ohai/hints.rb b/lib/ohai/hints.rb index c8b0bc1b..fc2af32d 100644 --- a/lib/ohai/hints.rb +++ b/lib/ohai/hints.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require 'ffi_yajl' +require 'ffi_yajl/json_gem' module Ohai module Hints diff --git a/lib/ohai/system.rb b/lib/ohai/system.rb index 9f836087..69919da9 100644 --- a/lib/ohai/system.rb +++ b/lib/ohai/system.rb @@ -29,7 +29,7 @@ require 'ohai/provides_map' require 'ohai/hints' require 'mixlib/shellout' -require 'ffi_yajl' +require 'ffi_yajl/json_gem' module Ohai class System |