From c600d9237bd0167332abbf8697d36596f82c19bf Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Jan 2012 18:47:28 -0800
Subject: [PATCH] Properly merge forward_agent and other SSH configs [GH-651]

---
 CHANGELOG.md              | 2 +-
 config/default.rb         | 1 +
 lib/vagrant/config/ssh.rb | 6 ------
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c5f43e84..d8165b697 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## 0.9.2 (unreleased)
 
-
+  - Fix `forward_agent` not working when outside of blocks. [GH-651]
 
 ## 0.9.1 (January 18, 2012)
 
diff --git a/config/default.rb b/config/default.rb
index 992adde9d..23bdb0361 100644
--- a/config/default.rb
+++ b/config/default.rb
@@ -11,6 +11,7 @@ Vagrant::Config.run do |config|
   config.ssh.timeout = 10
   config.ssh.forward_agent = false
   config.ssh.forward_x11 = false
+  config.ssh.shell = "bash"
 
   config.vm.auto_port_range = (2200..2250)
   config.vm.box_url = nil
diff --git a/lib/vagrant/config/ssh.rb b/lib/vagrant/config/ssh.rb
index 737fe8ab1..1a8cef121 100644
--- a/lib/vagrant/config/ssh.rb
+++ b/lib/vagrant/config/ssh.rb
@@ -13,12 +13,6 @@ module Vagrant
       attr_accessor :forward_x11
       attr_accessor :shell
 
-      def initialize
-        @shell            = "bash"
-        @forward_agent    = false
-        @forward_x11      = false
-      end
-
       def forwarded_port_key=(value)
         raise Errors::DeprecationError, :message => <<-MESSAGE
 `config.ssh.forwarded_port_key` is now gone. You must now use