summaryrefslogtreecommitdiff
path: root/lib/oxidized/input
diff options
context:
space:
mode:
authorytti <saku@ytti.fi>2016-07-10 13:48:45 +0300
committerGitHub <noreply@github.com>2016-07-10 13:48:45 +0300
commit426cf433390164d7ca64d109c3c0b68521732c46 (patch)
tree043e46157fc499455223201b108a64effc1891a9 /lib/oxidized/input
parent80e3d54056b7cfc7bb0ab240ae89e19b959b1a6a (diff)
parent2e2d5fde34efddc669e97c4c8af581ca2aaf3e1c (diff)
Merge pull request #494 from nickhilliard/im-move-ssh_no_exec-logic
move ssh_no_exec exec test into exec definition
Diffstat (limited to 'lib/oxidized/input')
-rw-r--r--lib/oxidized/input/ssh.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index db39a7e..8db5aa4 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -112,7 +112,7 @@ module Oxidized
end
def exec state=nil
- state == nil ? @exec : (@exec=state)
+ state == nil ? @exec : (@exec=state) unless vars :ssh_no_exec
end
def cmd_shell(cmd, expect_re)