From b7279ec79d07dedd292952750921b3761eab5de1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 11 Jan 2012 21:35:09 -0800
Subject: [PATCH] Custom merging behavior for VM configuration

---
 lib/vagrant/config/vm.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/vagrant/config/vm.rb b/lib/vagrant/config/vm.rb
index c3eae34b1..6d98b7755 100644
--- a/lib/vagrant/config/vm.rb
+++ b/lib/vagrant/config/vm.rb
@@ -28,6 +28,17 @@ module Vagrant
         @customizations = []
       end
 
+      # Custom merge method since some keys here are merged differently.
+      def merge(other)
+        result = super
+        result.forwarded_ports = @forwarded_ports + other.forwarded_ports
+        result.shared_folders  = @shared_folders.merge(other.shared_folders)
+        result.networks        = @networks + other.networks
+        result.provisioners    = @provisioners + other.provisioners
+        result.customizations  = @customizations + other.customizations
+        result
+      end
+
       def forward_port(guestport, hostport, options=nil)
         if !guestport.kind_of?(Integer)
           raise Errors::DeprecationError, :message => <<-MESSAGE