Merge pull request #5252 from rgacogne/rec-soa-root-nx-trust

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Tue, 9 May 2017 14:26:26 +0000 (16:26 +0200)

committer GitHub <noreply@github.com>

Tue, 9 May 2017 14:26:26 +0000 (16:26 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 9 May 2017 14:26:26 +0000 (16:26 +0200)
committer GitHub <noreply@github.com>
Tue, 9 May 2017 14:26:26 +0000 (16:26 +0200)
diff --cc pdns/recursordist/test-syncres_cc.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Tue, 9 May 2017 14:26:26 +0000 (16:26 +0200)
committer	GitHub <noreply@github.com>
	Tue, 9 May 2017 14:26:26 +0000 (16:26 +0200)
		1	2
pdns/recursordist/test-syncres_cc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history