haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update CHANGELOG

This commit is contained in:
Mitchell Hashimoto 2013-07-13 09:22:53 +09:00
parent bb808635f4
commit 0dfc6455ae
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -13,6 +13,8 @@ IMPROVEMENTS:
- `vagrant destroy` returns exit status 1 if any of the confirmations
are declined. [GH-923]
- Forwarded ports can specify a host IP and guest IP to bind to. [GH-1121]
- You can now set the "ip" of a private network that uses DHCP. This will
change the subnet and such that the DHCP server uses.
BUG FIXES:

2
plugins/providers/virtualbox/action/network.rb
View File

@ -220,7 +220,7 @@ module VagrantPlugins
options[:type] = options[:type].to_sym
# Default IP is in the 20-bit private network block for DHCP based networks
options[:ip] = "172.28.128.1" if options[:type] == :dhcp && options[:ip].nil?
options[:ip] = "172.28.128.1" if options[:type] == :dhcp && !options[:ip]
# Calculate our network address for the given IP/netmask
netaddr = network_address(options[:ip], options[:netmask])