From b56ff8724a03d089455d7c52f91e07f50c136d8b Mon Sep 17 00:00:00 2001 From: tyler-ball Date: Fri, 10 Oct 2014 07:38:53 -0700 Subject: Upgrading to latest ffi-yajl which contains fixes for Object#to_json --- Gemfile | 2 -- chef.gemspec | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index b298b396e0..1418235ebc 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,6 @@ source "https://rubygems.org" gemspec :name => "chef" gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby" -# TODO remove this when next version of ffi-yajl is released including this change -gem "ffi-yajl", :github => 'tyler-ball/ffi-yajl', :branch => 'tball/remove_to_json' group(:docgen) do gem "yard" diff --git a/chef.gemspec b/chef.gemspec index 7e9dc257b2..ff5e5b41fe 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |s| # it's the version I had when I tested. s.add_dependency "mime-types", "~> 1.16" - s.add_dependency "ffi-yajl", "~> 1.1" + s.add_dependency "ffi-yajl", "~> 1.2" s.add_dependency "net-ssh", "~> 2.6" s.add_dependency "net-ssh-multi", "~> 1.1" # CHEF-3027: The knife-cloud plugins require newer features from highline, core chef should not. -- cgit v1.2.1