lib/config_builder/loader/yaml.rb in vagrant-config_builder-0.6.0 vs lib/config_builder/loader/yaml.rb in vagrant-config_builder-0.7.0
- old
+ new
@@ -1,6 +1,7 @@
require 'yaml'
+require 'deep_merge'
class ConfigBuilder::Loader::YAML
# Load configuration from YAML files in one or more directories
#
@@ -21,10 +22,10 @@
rv = {}
files.each do |file|
contents = ::YAML.load_file(file)
if contents.is_a? Hash
- rv.merge! contents
+ rv.deep_merge! contents
end
end
rv
end