summaryrefslogtreecommitdiff
path: root/lib/chef_zero/chef_data/cookbook_data.rb
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2014-09-26 16:18:48 -0700
committertyler-ball <tyleraball@gmail.com>2014-09-26 16:18:48 -0700
commite3f2e8471cd97340c28b7541ffb0fa7143a33ca4 (patch)
tree0b6451871dc704ab7988c19ed5f53e5318a7bd5f /lib/chef_zero/chef_data/cookbook_data.rb
parent15f4a3e533eefa59412e81c0252af3166541ede0 (diff)
downloadchef-zero-tball/chef-zero-yajl-replace-json.tar.gz
Removing 'json' gem dependency, replacing with 'ffi-yajl'tball/chef-zero-yajl-replace-json
Diffstat (limited to 'lib/chef_zero/chef_data/cookbook_data.rb')
-rw-r--r--lib/chef_zero/chef_data/cookbook_data.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef_zero/chef_data/cookbook_data.rb b/lib/chef_zero/chef_data/cookbook_data.rb
index 6f0dd83..aed625b 100644
--- a/lib/chef_zero/chef_data/cookbook_data.rb
+++ b/lib/chef_zero/chef_data/cookbook_data.rb
@@ -75,7 +75,7 @@ module ChefZero
end
def from_json(json)
- self.merge!(JSON.parse(json))
+ self.merge!(FFI_Yajl::Parser.parse(json))
end
private