From 35f113e759bce9bcb427bbfdf207476bffe2ca6e Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Tue, 29 Oct 2019 10:34:29 -0700 Subject: [PATCH] Put back accidental case switching for comments on provisioner --- plugins/kernel_v2/config/vm.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index c65fbd963..e550734c0 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -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|