Merge remote-tracking branch 'ocado/empty-zones'

Conflicts:
	manifests/view.pp

manifests/view.pp

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

templates/view.erb

@@ -34,6 +34,9 @@ view "<%= @name %>" {
 	};
 <%-   end -%>
 <%- end -%>
+<%- if @empty_zones != '' -%>
+	empty-zones-enable <%= @empty_zones ? 'yes' : 'no' %>;
+<%- end -%>
 <%- if @servers and @servers.is_a?(Array) -%>
 <%-   @servers.each do |properties| -%>
 <%-     raise Puppet::Error, 'view servers must have an ip_addr key' unless properties.has_key?('ip_addr') -%>