diff options
| author | lamont-granquist <lamont@scriptkiddie.org> | 2014-04-07 14:07:41 -0700 |
|---|---|---|
| committer | lamont-granquist <lamont@scriptkiddie.org> | 2014-04-07 14:07:41 -0700 |
| commit | 2c46ef9b88e4cc2d277b1197a62d452dfae708af (patch) | |
| tree | 5480ede6ee50acc45fcb39eff79e06b46da6bcfd | |
| parent | 3036482c1f7b8010249dea81cfcac01662736788 (diff) | |
| parent | e4712a7570e9a39d88e37e1d4cb1a8e6282bdcdd (diff) | |
| download | chef-2c46ef9b88e4cc2d277b1197a62d452dfae708af.tar.gz | |
Merge pull request #1363 from jaymzh/json_gem_10
[CHEF-4632] backport #1179 - bump up upper limit on json gem to 1.8.1
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | CONTRIBUTIONS.md | 1 | ||||
| -rw-r--r-- | chef/chef.gemspec | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d02e71bbb..ea0f78ae66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Service Provider for MacOSX now supports `enable` and `disable` * Chef now gracefully handles corrupted cache files. * SIGTERM will once-more kill a non-daemonized chef-client (CHEF-5172) +* bump up upper limit on json gem to 1.8.1 (CHEF-4632) ## Last Release: 10.30.4 (02/18/2014) diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md index ade732cbe9..a3ad2a40c3 100644 --- a/CONTRIBUTIONS.md +++ b/CONTRIBUTIONS.md @@ -9,3 +9,4 @@ Example Contribution: * **jaymzh**: Service Provider for MacOSX now supports `enable` and `disable` * **jaymzh**: Chef now gracefully handles corrupted cache files. * **jaymzh**: SIGTERM will once-more kill a non-daemonized chef-client (CHEF-5172) +* **jaymzh**: bump up upper limit on json gem to 1.8.1 (CHEF-4632) diff --git a/chef/chef.gemspec b/chef/chef.gemspec index 2e3323c979..0e541dabc3 100644 --- a/chef/chef.gemspec +++ b/chef/chef.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |s| s.add_dependency "bunny", ">= 0.6.0", "< 0.8.0" # The JSON gem reliably releases breaking changes as a patch release - s.add_dependency "json", ">= 1.4.4", "<= 1.7.7" + s.add_dependency "json", ">= 1.4.4", "<= 1.8.1" s.add_dependency "yajl-ruby", "~> 1.1" s.add_dependency "treetop", "~> 1.4.9" s.add_dependency "net-ssh", "~> 2.6" |