diff options
| -rw-r--r-- | chef.gemspec | 2 | ||||
| -rw-r--r-- | lib/chef/json_compat.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chef.gemspec b/chef.gemspec index 2bbabbc3f2..dc40690c33 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-shellout", "~> 1.4" s.add_dependency "ohai", "~> 7.2" - s.add_dependency "ffi-yajl", "~> 1.0" + s.add_dependency "ffi-yajl", "~> 1.0", ">= 1.0.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. diff --git a/lib/chef/json_compat.rb b/lib/chef/json_compat.rb index ddccfe5fcb..e92d5c36ae 100644 --- a/lib/chef/json_compat.rb +++ b/lib/chef/json_compat.rb @@ -101,7 +101,7 @@ class Chef def to_json(obj, opts = nil) begin FFI_Yajl::Encoder.encode(obj, opts) - rescue FFI_Yajl::EndodeError => e + rescue FFI_Yajl::EncodeError => e raise Chef::Exceptions::JSON::EncodeError, e.message end end |