Merge pull request #8549 from Habbie/backport-7984-to-auth-4.2.x

author Peter van Dijk <peter.van.dijk@powerdns.com>

Thu, 21 Nov 2019 08:14:01 +0000 (09:14 +0100)

committer GitHub <noreply@github.com>

Thu, 21 Nov 2019 08:14:01 +0000 (09:14 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Thu, 21 Nov 2019 08:14:01 +0000 (09:14 +0100)
committer GitHub <noreply@github.com>
Thu, 21 Nov 2019 08:14:01 +0000 (09:14 +0100)
diff --cc docs/settings.rst
Simple merge
diff --cc pdns/slavecommunicator.cc
Simple merge
diff --cc pdns/ws-auth.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Thu, 21 Nov 2019 08:14:01 +0000 (09:14 +0100)
committer	GitHub <noreply@github.com>
	Thu, 21 Nov 2019 08:14:01 +0000 (09:14 +0100)
		1	2
docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/slavecommunicator.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history