diff options
| -rw-r--r-- | Gemfile.lock | 18 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/config.rb | 2 | ||||
| -rw-r--r-- | lib/chef/knife/ssh.rb | 1 | ||||
| -rw-r--r-- | lib/chef/mixin/shell_out.rb | 2 | ||||
| -rw-r--r-- | lib/chef/util/powershell/cmdlet.rb | 2 |
5 files changed, 12 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8b30e473ac..408a87d195 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: 62a879800c77cd6c1808e7a247976d7c910f6209 + revision: 3734d441498e51dd44cefc21d842232cd0b5a47d branch: master specs: - ohai (15.0.35) + ohai (15.0.36) chef-config (>= 12.8, < 16) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -121,7 +121,7 @@ GEM specs: addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) - appbundler (0.12.5) + appbundler (0.12.6) mixlib-cli (>= 1.4, < 3.0) mixlib-shellout (>= 2.0, < 4.0) ast (2.4.0) @@ -155,9 +155,9 @@ GEM multipart-post (>= 1.2, < 3) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - ffi (1.10.0) - ffi (1.10.0-x64-mingw32) - ffi (1.10.0-x86-mingw32) + ffi (1.11.1) + ffi (1.11.1-x64-mingw32) + ffi (1.11.1-x86-mingw32) ffi-libarchive (0.4.6) ffi (~> 1.0) ffi-win32-extensions (1.0.3) @@ -205,7 +205,7 @@ GEM jaro_winkler (1.5.2) json (2.2.0) libyajl2 (1.2.0) - license-acceptance (1.0.11) + license-acceptance (1.0.12) pastel (~> 0.7) tomlrb (~> 1.2) tty-box (~> 0.3) @@ -300,7 +300,7 @@ GEM ruby-progressbar (1.10.0) ruby-shadow (2.5.0) rubyntlm (0.6.2) - rubyzip (1.2.2) + rubyzip (1.2.3) safe_yaml (1.0.5) semverse (3.0.0) simplecov (0.16.1) @@ -324,7 +324,7 @@ GEM timers (4.3.0) tins (1.20.2) tomlrb (1.2.8) - train-core (2.1.2) + train-core (2.1.7) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 3.0) 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) diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb index a3cda96fb5..e979002c75 100644 --- a/lib/chef/knife/ssh.rb +++ b/lib/chef/knife/ssh.rb @@ -30,7 +30,6 @@ class Chef require_relative "../exceptions" require_relative "../search/query" require_relative "../util/path_helper" - require "mixlib/shellout" unless defined?(Mixlib::ShellOut) end include Chef::Mixin::ShellOut diff --git a/lib/chef/mixin/shell_out.rb b/lib/chef/mixin/shell_out.rb index d888dc3457..3a79c15b5d 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" class Chef diff --git a/lib/chef/util/powershell/cmdlet.rb b/lib/chef/util/powershell/cmdlet.rb index ab0516b20e..72657a6d55 100644 --- a/lib/chef/util/powershell/cmdlet.rb +++ b/lib/chef/util/powershell/cmdlet.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "mixlib/shellout" unless defined?(Mixlib::ShellOut) +require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT) require_relative "../../mixin/windows_architecture_helper" require_relative "cmdlet_result" |