Merge remote branch 'mitchellh/master'

2012-01-04 16:50:22 -08:00 · 2012-01-04 16:50:22 -08:00 · 0466d76bd8
parent b572b7dbd6 09e11ae792
commit 0466d76bd8
1 changed files with 1 additions and 1 deletions
--- a/lib/vagrant/action/vm/check_port_collisions.rb
+++ b/lib/vagrant/action/vm/check_port_collisions.rb
@ -59,7 +59,7 @@ module Vagrant
          # ports which are being used in other forwards so we're just
          # left with available ports.
          range = @env[:vm].config.vm.auto_port_range.to_a
-          range -= @env[:vm].config.vm.forwarded_ports.collect { |n, o| o[:hostport].to_i }
+          range -= @env[:vm].config.vm.forwarded_ports.collect { |opts| opts[:hostport].to_i }
          range -= existing_ports

          if range.empty?