Merge pull request #9114 from pieterlexis/rec-may-2020

author Pieter Lexis <pieter.lexis@powerdns.com>

Tue, 19 May 2020 08:49:13 +0000 (10:49 +0200)

committer GitHub <noreply@github.com>

Tue, 19 May 2020 08:49:13 +0000 (10:49 +0200)
author Pieter Lexis <pieter.lexis@powerdns.com>
Tue, 19 May 2020 08:49:13 +0000 (10:49 +0200)
committer GitHub <noreply@github.com>
Tue, 19 May 2020 08:49:13 +0000 (10:49 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/docs/settings.rst
Simple merge
diff --cc pdns/rpzloader.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Pieter Lexis <pieter.lexis@powerdns.com>
	Tue, 19 May 2020 08:49:13 +0000 (10:49 +0200)
committer	GitHub <noreply@github.com>
	Tue, 19 May 2020 08:49:13 +0000 (10:49 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rpzloader.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history