From 63d0400de700ac7c77ec36ce8d9237ad35b7ebd9 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 2 Sep 2013 09:08:37 -0700 Subject: [PATCH] kernel_v1: don't upgrade "max_tries" and "timeout" because they're gone --- plugins/kernel_v1/config/ssh.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/kernel_v1/config/ssh.rb b/plugins/kernel_v1/config/ssh.rb index f6eaeefa3..3af437184 100644 --- a/plugins/kernel_v1/config/ssh.rb +++ b/plugins/kernel_v1/config/ssh.rb @@ -34,12 +34,12 @@ module VagrantPlugins new.ssh.host = @host if @host != UNSET_VALUE new.ssh.port = @port if @port != UNSET_VALUE new.ssh.guest_port = @guest_port if @guest_port != UNSET_VALUE - new.ssh.max_tries = @max_tries if @max_tries != UNSET_VALUE - new.ssh.timeout = @timeout if @timeout != UNSET_VALUE new.ssh.private_key_path = @private_key_path if @private_key_path != UNSET_VALUE new.ssh.forward_agent = @forward_agent if @forward_agent != UNSET_VALUE new.ssh.forward_x11 = @forward_x11 if @forward_x11 != UNSET_VALUE new.ssh.shell = @shell if @shell != UNSET_VALUE + + # TODO: Warn that max_tries and timeout are gone end end end