diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-03-17 23:19:44 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-03-17 23:19:44 -0700 |
| commit | e63744e4face35607e1b6977431266c4b7525cb4 (patch) | |
| tree | 73618b74c014abde5bc2b2d29fd3a58034d9eeff | |
| parent | b53701827122f6bdb4cec66486329f403e2c7ba8 (diff) | |
| parent | 7681e7267c4a55d5cb98d7770d3e76e019cbf796 (diff) | |
| download | chef-e63744e4face35607e1b6977431266c4b7525cb4.tar.gz | |
Merge pull request #3098 from chef/lcg/bump-ffi-yajl
bumping ffi-yajl to pick up 2.x
| -rw-r--r-- | chef.gemspec | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chef.gemspec b/chef.gemspec index d32e0005d6..17861bc4a9 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", "~> 8.0" - s.add_dependency "ffi-yajl", "~> 1.2" + s.add_dependency "ffi-yajl", ">= 1.2", "< 3.0" 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. |