diff options
| author | John Keiser <john@johnkeiser.com> | 2016-08-08 13:32:59 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-08-08 13:32:59 -0700 |
| commit | ce1458cf8a0c0732e717ce680d84d4667d7d3c37 (patch) | |
| tree | 07f1eb1ac6aa7058b133192044f9c6d1a65a7ec1 /lib/chef/application.rb | |
| parent | 7ae019e9a12cb310e45512d7091b44c849e936da (diff) | |
| download | chef-ce1458cf8a0c0732e717ce680d84d4667d7d3c37.tar.gz | |
Revert "Merge pull request #5123 from chef/lcg/resolv-replace"
This reverts commit e8877cd363642ed6757c48d1ed5ab35509d87e22, reversing
changes made to 162d988d3bcfce2773ef2831fa33e416f53731f6.
Diffstat (limited to 'lib/chef/application.rb')
| -rw-r--r-- | lib/chef/application.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/chef/application.rb b/lib/chef/application.rb index 7396051678..f9735a3769 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -29,10 +29,6 @@ require "tmpdir" require "rbconfig" require "chef/application/exit_code" require "yaml" -require "resolv" -# on linux, we replace the glibc resolver with the ruby resolv library, which -# supports reloading. -require "resolv-replace" if RbConfig::CONFIG["host_os"] =~ /linux/ class Chef class Application |