Merge pull request #10704 from rgacogne/ddist-tcp-workers-default

author Remi Gacogne <remi.gacogne@powerdns.com>

Wed, 15 Sep 2021 13:14:16 +0000 (15:14 +0200)

committer GitHub <noreply@github.com>

Wed, 15 Sep 2021 13:14:16 +0000 (15:14 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Wed, 15 Sep 2021 13:14:16 +0000 (15:14 +0200)
committer GitHub <noreply@github.com>
Wed, 15 Sep 2021 13:14:16 +0000 (15:14 +0200)
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdistdist/docs/reference/tuning.rst
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Wed, 15 Sep 2021 13:14:16 +0000 (15:14 +0200)
committer	GitHub <noreply@github.com>
	Wed, 15 Sep 2021 13:14:16 +0000 (15:14 +0200)
		1	2
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/reference/tuning.rst	patch \|	diff1 \|	diff2 \|	blob \| history