Merge branch '089'
This commit is contained in:
commit
98448d5557
|
@ -8,7 +8,7 @@
|
|||
power off the system. [GH-575]
|
||||
- Tweaks to SSH to hopefully be more reliable in coming up.
|
||||
|
||||
## 0.8.9 (December 10, 2011)
|
||||
## 0.8.10 (December 10, 2011)
|
||||
|
||||
- Revert the SSH tweaks made in 0.8.8. It affected stability
|
||||
|
||||
|
|
|
@ -120,7 +120,7 @@ module Vagrant
|
|||
execute(:timeout => @vm.config.ssh.timeout, :port => ssh_port) { |ssh| }
|
||||
end
|
||||
|
||||
false
|
||||
true
|
||||
rescue Net::SSH::AuthenticationFailed
|
||||
raise Errors::SSHAuthenticationFailed
|
||||
rescue Timeout::Error, Errno::ECONNREFUSED, Net::SSH::Disconnect,
|
||||
|
|
Loading…
Reference in New Issue