Merge pull request #7877 from omoerbeek/rec-dnstap-include-query-zone

author Remi Gacogne <rgacogne@users.noreply.github.com>

Fri, 14 Jun 2019 08:57:02 +0000 (10:57 +0200)

committer GitHub <noreply@github.com>

Fri, 14 Jun 2019 08:57:02 +0000 (10:57 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Fri, 14 Jun 2019 08:57:02 +0000 (10:57 +0200)
committer GitHub <noreply@github.com>
Fri, 14 Jun 2019 08:57:02 +0000 (10:57 +0200)
diff --cc pdns/lwres.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Fri, 14 Jun 2019 08:57:02 +0000 (10:57 +0200)
committer	GitHub <noreply@github.com>
	Fri, 14 Jun 2019 08:57:02 +0000 (10:57 +0200)
		1	2
pdns/lwres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history