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 /lib/chef/mixin/shell_out.rb | |
| 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 'lib/chef/mixin/shell_out.rb')
| -rw-r--r-- | lib/chef/mixin/shell_out.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/mixin/shell_out.rb b/lib/chef/mixin/shell_out.rb index 967b4e97e3..6c2db85dfe 100644 --- a/lib/chef/mixin/shell_out.rb +++ b/lib/chef/mixin/shell_out.rb @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "mixlib/shellout" unless defined?(Mixlib::ShellOut) +require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT) require_relative "path_sanity" require "shellwords" unless defined?(Shellwords) |