Merge pull request #7172 from rgacogne/rec41-revert-formerr-with-edns

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

Fri, 9 Nov 2018 10:57:58 +0000 (11:57 +0100)

committer GitHub <noreply@github.com>

Fri, 9 Nov 2018 10:57:58 +0000 (11:57 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Fri, 9 Nov 2018 10:57:58 +0000 (11:57 +0100)
committer GitHub <noreply@github.com>
Fri, 9 Nov 2018 10:57:58 +0000 (11:57 +0100)
diff --cc pdns/recursordist/test-syncres_cc.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Fri, 9 Nov 2018 10:57:58 +0000 (11:57 +0100)
committer	GitHub <noreply@github.com>
	Fri, 9 Nov 2018 10:57:58 +0000 (11:57 +0100)
		1	2
pdns/recursordist/test-syncres_cc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history