Merge remote branch 'remotes/upstream/master'

CHANGELOG.md

@@ -1,4 +1,10 @@
-## 0.7.0 (unreleased)
+## 0.7.1 (unreleased)
+
+  - Change error output with references to VirtualBox 3.2 to 4.0.
+  - Internal SSH through net-ssh now uses `IdentitiesOnly` thanks to
+    upstream net-ssh fix.
+
+## 0.7.0 (January 19, 2011)
 
   - VirtualBox 4.0 support. Support for VirtualBox 3.2 is _dropped_, since
     the API is so different. Stay with the 0.6.x series if you have VirtualBox
@@ -33,6 +39,7 @@
     change, its unnecessary.
   - Puppet supports `module_path` configuration to mount local modules directory
     as a shared folder and configure puppet with it. [GH-270]
+  - `ssh-config` now outputs `127.0.0.1` as the host instead of `localhost`.
 
 ## 0.6.9 (December 21, 2010)
 

lib/vagrant/ssh.rb

@@ -70,6 +70,7 @@ module Vagrant
         Net::SSH.start(env.config.ssh.host,
                        env.config.ssh.username,
                        opts.merge( :keys => [env.config.ssh.private_key_path],
+                                   :keys_only => true,
                                    :user_known_hosts_file => [],
                                    :paranoid => false,
                                    :config => false)) do |ssh|

lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "0.7.0.dev"
+  VERSION = "0.7.1.dev"
 end

templates/locales/en.yml

@@ -133,10 +133,10 @@ en:
       virtualbox_not_detected: |-
         Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed.
         If VirtualBox is installed, it may be an incorrect version. Vagrant currently
-        requires VirtualBox 3.2.x. Please install the proper version to continue.
+        requires VirtualBox 4.0.x. Please install the proper version to continue.
       virtualbox_not_detected_win64: |-
         Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed
-        with version 3.2.0 or higher.
+        with version 4.0.0 or higher.
 
         Additionally, it appears you're on 64-bit Windows. If this is the case, and
         VirtualBox is properly installed with the correct version, then please make

templates/ssh_config.erb

@@ -1,5 +1,5 @@
 Host <%= host_key %>
-  HostName localhost
+  HostName 127.0.0.1
   User <%= ssh_user %>
   Port <%= ssh_port %>
   UserKnownHostsFile /dev/null

test/vagrant/ssh_test.rb

@@ -147,6 +147,7 @@ class SshTest < Test::Unit::TestCase
         assert_equal @env.config.ssh.username, username
         assert_equal @ssh.port, opts[:port]
         assert_equal [@env.config.ssh.private_key_path], opts[:keys]
+        assert opts[:keys_only]
         true
       end
       @ssh.execute

vagrant.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "erubis", "~> 2.6.6"
   s.add_dependency "json", "~> 1.4.6"
   s.add_dependency "mario", "~> 0.0.6"
-  s.add_dependency "net-ssh", "~> 2.0.23"
+  s.add_dependency "net-ssh", "~> 2.1.0"
   s.add_dependency "net-scp", "~> 1.0.4"
   s.add_dependency "i18n", "~> 0.5.0"
   s.add_dependency "thor", "~> 0.14.6"