Merge pull request paliarush#197 from paliarush/problems-with-deep-me…

…rge-124 Problems with deep_merge paliarush#124
orlandothoeny · Jul 24, 2018 · c06ace0 · c06ace0
2 parents cc4e939 + 193d3a9
commit c06ace0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Vagrantfile b/Vagrantfile
@@ -4,6 +4,7 @@
 Vagrant.require_version ">= 1.8"
 
 require 'yaml'
+require 'vagrant/util/deep_merge'
 
 module OS
     def OS.is_windows
@@ -20,7 +21,7 @@ module Config
 
         config_data_dist = YAML.load_file(config_dist_file)
         config_data = File.exists?(config_file) ? YAML.load_file(config_file) : {}
-        return config_data_dist.deep_merge!(config_data)
+        return Vagrant::Util::DeepMerge.deep_merge(config_data_dist, config_data)
     end
 end