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

Conflicts:
	templates/view.erb
This commit is contained in:
Nate Riffe 2016-04-20 08:07:56 -05:00
commit 1ec9823c0f
2 changed files with 4 additions and 0 deletions

View File

@ -12,6 +12,7 @@ define bind::view (
$notify_source = '', $notify_source = '',
$also_notify = [], $also_notify = [],
$order = '10', $order = '10',
$minimal_responses = false,
) { ) {
$confdir = $::bind::confdir $confdir = $::bind::confdir
$default_zones_include = $::bind::default_zones_include $default_zones_include = $::bind::default_zones_include

View File

@ -43,6 +43,9 @@ view "<%= @name %>" {
<%- end -%> <%- end -%>
}; };
<%- end -%> <%- end -%>
<%- if @minimal_responses -%>
minimal-responses yes;
<%- end -%>
<%- if @also_notify and @also_notify != '' -%> <%- if @also_notify and @also_notify != '' -%>
also-notify { also-notify {
<%- Array(@also_notify).each do |server| -%> <%- Array(@also_notify).each do |server| -%>