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

Shared folder inheritence doesn't overwrite multi-vm [GH-1935]

This commit is contained in:
Mitchell Hashimoto 2013-07-17 23:18:39 -04:00
parent bc7b481dbe
commit 04afd11fd1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -6,6 +6,8 @@ BUG FIXES:
- Debian/Ubuntu change hostname works properly if eth0 is configured - Debian/Ubuntu change hostname works properly if eth0 is configured
with hot-plugging. [GH-1929] with hot-plugging. [GH-1929]
- NFS exports with improper casing on Mac OS X work properly. [GH-1202] - NFS exports with improper casing on Mac OS X work properly. [GH-1202]
- Shared folders overriding '/vagrant' in multi-VM environments no
longer all just use the last value. [GH-1935]
## 1.2.4 (July 16, 2013) ## 1.2.4 (July 16, 2013)

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

@ -91,7 +91,11 @@ module VagrantPlugins
# Merge synced folders. # Merge synced folders.
other_folders = other.instance_variable_get(:@__synced_folders) other_folders = other.instance_variable_get(:@__synced_folders)
new_folders = @__synced_folders.dup new_folders = {}
@__synced_folders.each do |key, value|
new_folders[key] = value.dup
end
other_folders.each do |id, options| other_folders.each do |id, options|
new_folders[id] ||= {} new_folders[id] ||= {}
new_folders[id].merge!(options) new_folders[id].merge!(options)