diff options
| -rw-r--r-- | chef.gemspec | 10 | ||||
| -rw-r--r-- | lib/chef/cookbook_uploader.rb | 1 | ||||
| -rw-r--r-- | lib/chef/provider/remote_file/content.rb | 1 |
3 files changed, 0 insertions, 12 deletions
diff --git a/chef.gemspec b/chef.gemspec index b5e4a5fc70..c171bda880 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -19,16 +19,6 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-shellout", "~> 1.4" s.add_dependency "ohai", "= 7.2.0.rc.1" - # 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 - # it's the version I had when I tested. - s.add_dependency "mime-types", "~> 1.16" - s.add_dependency "ffi-yajl", "~> 1.0" s.add_dependency "net-ssh", "~> 2.6" s.add_dependency "net-ssh-multi", "~> 1.1" diff --git a/lib/chef/cookbook_uploader.rb b/lib/chef/cookbook_uploader.rb index 968673d87a..adad55b4ca 100644 --- a/lib/chef/cookbook_uploader.rb +++ b/lib/chef/cookbook_uploader.rb @@ -1,6 +1,5 @@ require 'set' -require 'rest_client' require 'chef/exceptions' require 'chef/knife/cookbook_metadata' require 'chef/digester' diff --git a/lib/chef/provider/remote_file/content.rb b/lib/chef/provider/remote_file/content.rb index 3a8514e077..ef55dd77cd 100644 --- a/lib/chef/provider/remote_file/content.rb +++ b/lib/chef/provider/remote_file/content.rb @@ -17,7 +17,6 @@ # limitations under the License. # -require 'rest_client' require 'uri' require 'tempfile' require 'chef/file_content_management/content_base' |