summaryrefslogtreecommitdiff
path: root/lib/chef/json_compat.rb
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2014-10-08 10:48:18 -0700
committertyler-ball <tyleraball@gmail.com>2014-10-08 10:48:18 -0700
commit9f44841df63fac60e773917bb3240d8d64e6ed2e (patch)
treede5ff40308d6dc590a500eb3e7ec8d83e1a896df /lib/chef/json_compat.rb
parentb92978dd22f734f33044ec62c605b6eedb43bb6e (diff)
downloadchef-9f44841df63fac60e773917bb3240d8d64e6ed2e.tar.gz
Adding back `require 'json'` to prevent breaking consumers who currently use Hash.to_json in their cookbookstball/yajl-replace-json
Diffstat (limited to 'lib/chef/json_compat.rb')
-rw-r--r--lib/chef/json_compat.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/chef/json_compat.rb b/lib/chef/json_compat.rb
index 843b87b25c..3350da0c13 100644
--- a/lib/chef/json_compat.rb
+++ b/lib/chef/json_compat.rb
@@ -19,6 +19,8 @@
require 'ffi_yajl'
require 'chef/exceptions'
+# We're requiring this to prevent breaking consumers using Hash.to_json
+require 'json'
class Chef
class JSONCompat