From d07810af583defd107aab10f3b4186e705b7385c Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 1 Mar 2013 16:49:06 -0800 Subject: [PATCH] Properly merge networks --- plugins/kernel_v2/config/vm.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index bd1c4759e..834db3ab4 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -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)