summaryrefslogtreecommitdiff
path: root/lib/chef/handler
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-08-11 17:36:52 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2014-08-11 17:36:52 -0700
commit3f415b11dfb1c494a45a0a83d69196cd75924cf1 (patch)
treeee6bbff8836a1a8514fe3be7ce9ead67ad8cb02a /lib/chef/handler
parentb4dfc6a1f478f29105a3b4746029e3ad46291b82 (diff)
downloadchef-3f415b11dfb1c494a45a0a83d69196cd75924cf1.tar.gz
remove JSON gem usage
should fully convert to using ffi-yajl there are still issues with JSON gem monkeypatching interacting with chef-zero and the spec tests so we keep the requires here for the json gem and the ffi_yajl/json_gem here. when ohai and chef-zero are fixed, we an just require ffi_yajl.
Diffstat (limited to 'lib/chef/handler')
-rw-r--r--lib/chef/handler/json_file.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/chef/handler/json_file.rb b/lib/chef/handler/json_file.rb
index 3473db1838..405c91795e 100644
--- a/lib/chef/handler/json_file.rb
+++ b/lib/chef/handler/json_file.rb
@@ -58,7 +58,6 @@ class Chef
end
end
-
end
end
end