Merge remote-tracking branch 'ocado/minimal-responses' into 6.0-prerelease

Conflicts: templates/view.erb
2016-04-20 08:07:56 -05:00
parent d50406d0df e579b5479b
commit 1ec9823c0f
2 changed files with 4 additions and 0 deletions
@@ -43,6 +43,9 @@ view "<%= @name %>" {
 <%-     end -%>
 	};
 <%- end -%>
+<%- if @minimal_responses -%>
+	minimal-responses yes;
+<%- end -%>
 <%- if @also_notify and @also_notify != '' -%>
 	also-notify {
 <%-     Array(@also_notify).each do |server| -%>