Merge 5268a4a into 5a4b540

voxpupuli · Dec 1, 2016 · 4dfe45f · 4dfe45f
2 parents 5a4b540 + 5268a4a
commit 4dfe45f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/templates/hiera.yaml.erb b/templates/hiera.yaml.erb
@@ -18,7 +18,7 @@
 <% if @merge_behavior -%>
 :merge_behavior: <%= @merge_behavior %>
 <% end -%>
-<% if @merge_behavior == 'deep' && !@deep_merge_options.empty? -%>
+<% if (@merge_behavior == 'deep' || @merge_behaviour == 'deeper') && !@deep_merge_options.empty? -%>
 :deep_merge_options:
   <%- @deep_merge_options.each do |option_key, option_value| -%>
   :<%= option_key %>: <%= option_value %>