haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

communicators/ssh: timeout waiting for connection + header [GH-2226]

This commit is contained in:
Mitchell Hashimoto 2013-09-18 09:32:30 -07:00
parent 91ff1ec8ae
commit f9e4ea9ce8
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -4,6 +4,8 @@ BUG FIXES:
- core: Fix issues with dynamic linker not finding symbols on OS X. [GH-2219] - core: Fix issues with dynamic linker not finding symbols on OS X. [GH-2219]
- core: Properly clean up machine directories on destroy. [GH-2223] - core: Properly clean up machine directories on destroy. [GH-2223]
- core: Add a timeout to waiting for SSH connection and server headers
on SSH. [GH-2226]
## 1.3.2 (September 17, 2013) ## 1.3.2 (September 17, 2013)

1
plugins/communicators/ssh/communicator.rb
View File

@ -207,6 +207,7 @@ module VagrantPlugins
# Setup logging for connections # Setup logging for connections
connect_opts = opts.merge({ connect_opts = opts.merge({
:logger => ssh_logger, :logger => ssh_logger,
:timeout => 15,
:verbose => :debug :verbose => :debug
}) })