Merge pull request #8812 from rgacogne/netmask-compare-masked

author Remi Gacogne <remi.gacogne@powerdns.com>

Fri, 21 Feb 2020 08:55:00 +0000 (09:55 +0100)

committer GitHub <noreply@github.com>

Fri, 21 Feb 2020 08:55:00 +0000 (09:55 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Fri, 21 Feb 2020 08:55:00 +0000 (09:55 +0100)
committer GitHub <noreply@github.com>
Fri, 21 Feb 2020 08:55:00 +0000 (09:55 +0100)
diff --cc pdns/iputils.hh
Simple merge
diff --cc pdns/test-iputils_hh.cc
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Fri, 21 Feb 2020 08:55:00 +0000 (09:55 +0100)
committer	GitHub <noreply@github.com>
	Fri, 21 Feb 2020 08:55:00 +0000 (09:55 +0100)
		1	2
pdns/iputils.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/test-iputils_hh.cc	patch \|	diff1 \|	diff2 \|	blob \| history