diff options
| author | Noah Kantrowitz <noah@coderanger.net> | 2016-08-02 16:36:05 -0700 |
|---|---|---|
| committer | Noah Kantrowitz <noah@coderanger.net> | 2016-08-02 16:36:05 -0700 |
| commit | 0368df838c36fd5a54c75007aae3c2e28cbdba1b (patch) | |
| tree | d89eac235ed3890c4628c59505299627a44508ca /lib/chef/application.rb | |
| parent | 16fbf0a9a81daa1e3418eca251e59b4545ae0b88 (diff) | |
| parent | 767a45530b373bbd4818b93ab1efe5cd3c7da5ed (diff) | |
| download | chef-0368df838c36fd5a54c75007aae3c2e28cbdba1b.tar.gz | |
Merge branch 'master' into configoption
Diffstat (limited to 'lib/chef/application.rb')
| -rw-r--r-- | lib/chef/application.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/chef/application.rb b/lib/chef/application.rb index fa740e068a..c377ffdb36 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -29,6 +29,10 @@ 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 |