lib/config_builder/loader/yaml.rb in vagrant-config_builder-0.7.0 vs lib/config_builder/loader/yaml.rb in vagrant-config_builder-0.7.1

@@ -1,7 +1,7 @@
 require 'yaml'
-require 'deep_merge'
+require 'deep_merge/core'
 
 class ConfigBuilder::Loader::YAML
 
   # Load configuration from YAML files in one or more directories
   #
@@ -22,10 +22,10 @@
     rv = {}
 
     files.each do |file|
       contents = ::YAML.load_file(file)
       if contents.is_a? Hash
-        rv.deep_merge! contents
+        rv = DeepMerge::deep_merge!(contents, rv, {:preserve_unmergables => false})
       end
     end
 
     rv
   end