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

kernel/v2: provider configs do proper merge logic for config

This commit is contained in:
Mitchell Hashimoto 2014-04-18 20:36:29 -07:00
parent 8171471628
commit bad6537e86
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -383,7 +383,9 @@ module VagrantPlugins
begin begin
blocks.each do |b| blocks.each do |b|
b.call(config, Vagrant::Config::V2::DummyConfig.new) new_config = config_class.new
b.call(new_config, Vagrant::Config::V2::DummyConfig.new)
config = config.merge(new_config)
end end
rescue Exception => e rescue Exception => e
raise Vagrant::Errors::VagrantfileLoadError, raise Vagrant::Errors::VagrantfileLoadError,