diff options
| author | Tyler Ball <tyleraball@gmail.com> | 2014-10-10 10:59:15 -0700 |
|---|---|---|
| committer | Tyler Ball <tyleraball@gmail.com> | 2014-10-10 10:59:15 -0700 |
| commit | f9ae9e5ca3c1f457b32993c09b130a7b613ed4f8 (patch) | |
| tree | a55993faf9b7fcb8d58e7bea508f1bf91e7338b2 | |
| parent | 34221471b5e9924ed7dd7915170245a081c9b71f (diff) | |
| parent | b7ea9fcb151d82a6ad3e656b77170fa0fca42236 (diff) | |
| download | chef-f9ae9e5ca3c1f457b32993c09b130a7b613ed4f8.tar.gz | |
Merge pull request #2204 from opscode/tball/latest-ffi-yajl
Upgrading to latest ffi-yajl which contains fixes for Object#to_json
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | chef.gemspec | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -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 f970bb32f9..075d1fc5d6 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-shellout", ">= 2.0.0.rc.0", "< 3.0" s.add_dependency "ohai", ">= 7.6.0.rc.0" - 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. |