summaryrefslogtreecommitdiff
path: root/lib/net/ssh
diff options
context:
space:
mode:
authorsawanoboly <sawanoboriyu@higanworks.com>2016-03-11 14:34:21 +0900
committersawanoboly <sawanoboriyu@higanworks.com>2016-03-11 14:34:21 +0900
commit1da3d4876a09f3b7932b32b58a309cfbbde1726a (patch)
tree50ed9e449955cb564e2bde72b415acf02e935218 /lib/net/ssh
parent4f5083f1505e9005158cb36a8f4a9f0535fa25b8 (diff)
parentdc9c6e79d2572d355cf6d67a7d8a3c3b22d23d12 (diff)
downloadnet-ssh-multi-1da3d4876a09f3b7932b32b58a309cfbbde1726a.tar.gz
Merge remote-tracking branch 'upstream/master' into keep_forwarding_in_pending_connection
Diffstat (limited to 'lib/net/ssh')
-rw-r--r--lib/net/ssh/multi/server.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/net/ssh/multi/server.rb b/lib/net/ssh/multi/server.rb
index f8fa552..58083e3 100644
--- a/lib/net/ssh/multi/server.rb
+++ b/lib/net/ssh/multi/server.rb
@@ -1,4 +1,5 @@
require 'net/ssh'
+require 'timeout'
module Net; module SSH; module Multi
# Encapsulates the connection information for a single remote server, as well