summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSalim Alam <salam@chef.io>2016-04-07 08:01:20 -0700
committerSalim Alam <salam@chef.io>2016-04-07 08:01:20 -0700
commitfd5b09cd7aef8d18cbee84cab31800c086164739 (patch)
treee4f6ac25232862d08f8c0f5ff8b7d9a8cc78ea76 /lib
parent136371ae78d06519026cc03e3e0383b9979871d1 (diff)
parentf52259d38646a50b96605a0700e96be36672eca0 (diff)
downloadchef-fd5b09cd7aef8d18cbee84cab31800c086164739.tar.gz
Merge pull request #4804 from chef/salam/knife-tweak
Add default timeout
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/knife/ssh.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb
index 31356b6f48..2bbcbfc79e 100644
--- a/lib/chef/knife/ssh.rb
+++ b/lib/chef/knife/ssh.rb
@@ -84,7 +84,8 @@ class Chef
:short => "-t SECONDS",
:long => "--ssh-timeout SECONDS",
:description => "The ssh connection timeout",
- :proc => Proc.new { |key| Chef::Config[:knife][:ssh_timeout] = key.strip.to_i }
+ :proc => Proc.new { |key| Chef::Config[:knife][:ssh_timeout] = key.strip.to_i },
+ :default => 120
option :ssh_gateway,
:short => "-G GATEWAY",