Merge pull request #6566 from rgacogne/rec-queries-pipe

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

Wed, 16 May 2018 15:09:16 +0000 (17:09 +0200)

committer GitHub <noreply@github.com>

Wed, 16 May 2018 15:09:16 +0000 (17:09 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Wed, 16 May 2018 15:09:16 +0000 (17:09 +0200)
committer GitHub <noreply@github.com>
Wed, 16 May 2018 15:09:16 +0000 (17:09 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Wed, 16 May 2018 15:09:16 +0000 (17:09 +0200)
committer	GitHub <noreply@github.com>
	Wed, 16 May 2018 15:09:16 +0000 (17:09 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history