summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2015-11-25 09:41:43 +0000
committerThom May <thom@may.lt>2015-11-25 09:41:43 +0000
commit5fd2df311af0b5867c6c845321901f841fc1c7de (patch)
tree1dd68042e5f370b20d758627bc532a51e8f1a33f
parent26dbab99fd9aea988195f027975963db14a9de87 (diff)
parentf8e55db82af844448f50611fa7fc8d770a634f17 (diff)
downloadchef-5fd2df311af0b5867c6c845321901f841fc1c7de.tar.gz
Merge pull request #4153 from matschaffer/patch-1
Require ShellOut before Knife::SSH definition
-rw-r--r--lib/chef/knife/ssh.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb
index fcffb718f5..99ae2f426a 100644
--- a/lib/chef/knife/ssh.rb
+++ b/lib/chef/knife/ssh.rb
@@ -16,6 +16,7 @@
# limitations under the License.
#
+require 'chef/mixin/shell_out'
require 'chef/knife'
class Chef
@@ -29,7 +30,6 @@ class Chef
require 'readline'
require 'chef/exceptions'
require 'chef/search/query'
- require 'chef/mixin/shell_out'
require 'chef/mixin/command'
require 'chef/util/path_helper'
require 'mixlib/shellout'