Merge pull request #8538 from rgacogne/ddist-reduce-sholder-copies

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

Fri, 22 Nov 2019 09:26:28 +0000 (10:26 +0100)

committer GitHub <noreply@github.com>

Fri, 22 Nov 2019 09:26:28 +0000 (10:26 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Fri, 22 Nov 2019 09:26:28 +0000 (10:26 +0100)
committer GitHub <noreply@github.com>
Fri, 22 Nov 2019 09:26:28 +0000 (10:26 +0100)
diff --cc pdns/dnsdist-dynblocks.hh
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/rec_channel_rec.cc
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Fri, 22 Nov 2019 09:26:28 +0000 (10:26 +0100)
committer	GitHub <noreply@github.com>
	Fri, 22 Nov 2019 09:26:28 +0000 (10:26 +0100)
		1	2
pdns/dnsdist-dynblocks.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rec_channel_rec.cc	patch \|	diff1 \|	diff2 \|	blob \| history