diff options
| author | Lamont Granquist <lamont@chef.io> | 2019-05-24 15:53:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 15:53:47 -0700 |
| commit | 5746a176d2fff2cfd0afc3078115a3d4461a09ad (patch) | |
| tree | 71a5128a57f4260e4c33adf4e4125187f8f748d2 /chef-config | |
| parent | 5fadbc45322b2c0e4da171ee24f1f0e42e235733 (diff) | |
| parent | 3e7a56f246ef42a2471cb8bfb60cc18309128954 (diff) | |
| download | chef-5746a176d2fff2cfd0afc3078115a3d4461a09ad.tar.gz | |
Merge pull request #8595 from chef/lcg/shellout-require-idempotency
fix shellout require idempotency and bump gems
Diffstat (limited to 'chef-config')
| -rw-r--r-- | chef-config/lib/chef-config/config.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb index 72b456d848..051cdbfb7f 100644 --- a/chef-config/lib/chef-config/config.rb +++ b/chef-config/lib/chef-config/config.rb @@ -28,7 +28,7 @@ require_relative "windows" require_relative "path_helper" require_relative "mixin/fuzzy_hostname_matcher" -require "mixlib/shellout" unless defined?(Mixlib::ShellOut) +require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT) require "uri" unless defined?(URI) require "addressable/uri" unless defined?(Addressable::URI) require "openssl" unless defined?(OpenSSL) |