Merge pull request #7296 from rgacogne/rec-rpz-local-types

author Remi Gacogne <rgacogne@users.noreply.github.com>

Fri, 11 Jan 2019 08:58:03 +0000 (09:58 +0100)

committer GitHub <noreply@github.com>

Fri, 11 Jan 2019 08:58:03 +0000 (09:58 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Fri, 11 Jan 2019 08:58:03 +0000 (09:58 +0100)
committer GitHub <noreply@github.com>
Fri, 11 Jan 2019 08:58:03 +0000 (09:58 +0100)
diff --cc pdns/filterpo.cc
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/Makefile.am
Simple merge
diff --cc pdns/recursordist/test-syncres_cc.cc
Simple merge
diff --cc pdns/rpzloader.cc
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Fri, 11 Jan 2019 08:58:03 +0000 (09:58 +0100)
committer	GitHub <noreply@github.com>
	Fri, 11 Jan 2019 08:58:03 +0000 (09:58 +0100)
		1	2
pdns/filterpo.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/test-syncres_cc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rpzloader.cc	patch \|	diff1 \|	diff2 \|	blob \| history