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

Update merge comment for disk config

This commit is contained in:
Brian Cain 2019-10-29 10:33:29 -07:00
parent 87366cf4f3
commit 9c1d05113f
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,10 +134,8 @@ module VagrantPlugins
if other_p if other_p
# there is an override. take it. # there is an override. take it.
other_p.config = p.config.merge(other_p.config) other_p.config = p.config.merge(other_p.config)
#other_p.run ||= p.run
#next if !other_p.preserve_order
# we're preserving order, delete from other # Remove duplicate disk config from other
p = other_p p = other_p
other_disks.delete(other_p) other_disks.delete(other_p)
end end