diff options
| author | Seth Chisamore <schisamo@getchef.com> | 2014-07-15 16:03:57 -0400 |
|---|---|---|
| committer | Seth Chisamore <schisamo@getchef.com> | 2014-07-15 16:03:57 -0400 |
| commit | 88d671309b60fd859859c90537aa97277e25ee73 (patch) | |
| tree | 5aae6a7156db707e70f1d6c7c113ed8b6ae010f4 | |
| parent | 749012769af660221d7190bc25960971a98d1930 (diff) | |
| parent | 334678b264fa99610d7b7fe0fe8b1ae3a74a1644 (diff) | |
| download | chef-88d671309b60fd859859c90537aa97277e25ee73.tar.gz | |
Merge pull request #1644 from opscode/schisamo/lock-down-rest-client
Lock down rest-client to <= 1.6.7
| -rw-r--r-- | chef.gemspec | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chef.gemspec b/chef.gemspec index 15d51ec4ac..09a06f7b36 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -19,7 +19,10 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-shellout", "~> 1.4" s.add_dependency "ohai", "= 7.2.0.rc.1" - s.add_dependency "rest-client", ">= 1.0.4", "< 1.7.0" + # Lock down rest-client to avoid pulling in rdoc and breaking Omnibus builds + # on Solaris. See the original issue for more details: + # https://github.com/opscode/chef/issues/1211 + s.add_dependency "rest-client", ">= 1.0.4", "<= 1.6.7" # rest-client has an unbounded dependency on mime-types. # mime-types 2.0 removes support for ruby 1.8.7 (gemspec requires ruby # 1.9.2+), so we have to add an additional pin. 1.16 is chosen just becuase |