Skip to content

Commit

Permalink
convert to using ffi_yajl
Browse files Browse the repository at this point in the history
  • Loading branch information
lamont-granquist committed Jun 23, 2014
1 parent 6a9ed8c commit 2a9f12b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/chef/knife/core/object_loader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
# limitations under the License.
#

require 'ffi_yajl'

class Chef
class Knife
module Core
Expand Down Expand Up @@ -83,7 +85,7 @@ def find_all_object_dirs(path)
def object_from_file(filename)
case filename
when /\.(js|json)$/
r = Yajl::Parser.parse(IO.read(filename))
r = FFI_Yajl::Parser.parse(IO.read(filename))

# Chef::DataBagItem doesn't work well with the json_create method
if @klass == Chef::DataBagItem
Expand Down

0 comments on commit 2a9f12b

Please sign in to comment.