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

Put back accidental case switching for comments on provisioner

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

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

@ -178,17 +178,17 @@ module VagrantPlugins
@provisioners.each do |p|
other_p = other_provs.find { |o| p.id == o.id }
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.run ||= p.run
next if !other_p.preserve_order
# we're preserving order, delete from other
# We're preserving order, delete from other
p = other_p
other_provs.delete(other_p)
end
# there is an override, merge it into the
# There is an override, merge it into the
new_provs << p.dup
end
other_provs.each do |p|