lib/bora/template.rb in bora-1.7.0 vs lib/bora/template.rb in bora-1.7.1

- old
+ new

@@ -1,7 +1,7 @@ require 'bora/stack' -require 'hashie' +require 'deep_merge' class Bora class Template # These are properties that you can define on the template, but which can also be defined and overriden in the stack @@ -34,12 +34,10 @@ end private def resolve_stack_config(template_config, stack_config, override_config) - Hashie::Mash.new( - inheritable_properties(template_config) - ).deep_merge(stack_config).merge(overridable_properties(override_config)) + inheritable_properties(template_config).deep_merge!(stack_config).merge(overridable_properties(override_config)) end def inheritable_properties(config) config.select { |k| INHERITABLE_PROPERTIES.include?(k) } end