diff options
| author | Tyler Ball <tyleraball@gmail.com> | 2014-10-10 12:14:51 -0700 |
|---|---|---|
| committer | Tyler Ball <tyleraball@gmail.com> | 2014-10-10 12:14:51 -0700 |
| commit | 6576eb994c1e886e9cef22840938e643ddb47bd7 (patch) | |
| tree | f60ce155940db45152bd17afc4292b6f641b3a3c | |
| parent | c57ed6131d5544cca7e4d3dfeeccc983c2123637 (diff) | |
| parent | b56ff8724a03d089455d7c52f91e07f50c136d8b (diff) | |
| download | chef-6576eb994c1e886e9cef22840938e643ddb47bd7.tar.gz | |
Merge pull request #2205 from opscode/tball/11-stable-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 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. |