Merge pull request #5758 from pieterlexis/trustanchor.server

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Fri, 21 Jun 2019 10:20:12 +0000 (12:20 +0200)

committer GitHub <noreply@github.com>

Fri, 21 Jun 2019 10:20:12 +0000 (12:20 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 21 Jun 2019 10:20:12 +0000 (12:20 +0200)
committer GitHub <noreply@github.com>
Fri, 21 Jun 2019 10:20:12 +0000 (12:20 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/docs/settings.rst
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Fri, 21 Jun 2019 10:20:12 +0000 (12:20 +0200)
committer	GitHub <noreply@github.com>
	Fri, 21 Jun 2019 10:20:12 +0000 (12:20 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history