diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-08-11 17:36:52 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-08-11 17:36:52 -0700 |
| commit | 3f415b11dfb1c494a45a0a83d69196cd75924cf1 (patch) | |
| tree | ee6bbff8836a1a8514fe3be7ce9ead67ad8cb02a /lib/chef/chef_fs/chef_fs_data_store.rb | |
| parent | b4dfc6a1f478f29105a3b4746029e3ad46291b82 (diff) | |
| download | chef-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/chef_fs/chef_fs_data_store.rb')
| -rw-r--r-- | lib/chef/chef_fs/chef_fs_data_store.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/chef_fs/chef_fs_data_store.rb b/lib/chef/chef_fs/chef_fs_data_store.rb index b84fc1945d..b2435d8201 100644 --- a/lib/chef/chef_fs/chef_fs_data_store.rb +++ b/lib/chef/chef_fs/chef_fs_data_store.rb @@ -269,7 +269,7 @@ class Chef # Create a little Chef::ChefFS memory filesystem with the data cookbook_fs = Chef::ChefFS::FileSystem::MemoryRoot.new('uploading') - cookbook = JSON.parse(data, :create_additions => false) + cookbook = Chef::JSONCompat.parse(data) cookbook.each_pair do |key, value| if value.is_a?(Array) value.each do |file| |