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

Properly merge networks

This commit is contained in:
Mitchell Hashimoto 2013-03-01 16:49:06 -08:00
parent 36b805367d
commit d07810af58
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/kernel_v2/config/vm.rb
View File

@ -40,7 +40,7 @@ module VagrantPlugins
# Custom merge method since some keys here are merged differently.
def merge(other)
super.tap do |result|
result.instance_variable_set(:@__networks, @__networks + other.networks)
result.instance_variable_set(:@__networks, @__networks.merge(other.networks))
result.instance_variable_set(:@synced_folders, @synced_folders.merge(other.synced_folders))
result.instance_variable_set(:@provisioners, @provisioners + other.provisioners)