Merge pull request #6754 from rgacogne/dnsdist-subnet-collision

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

Mon, 9 Jul 2018 07:21:14 +0000 (09:21 +0200)

committer GitHub <noreply@github.com>

Mon, 9 Jul 2018 07:21:14 +0000 (09:21 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Mon, 9 Jul 2018 07:21:14 +0000 (09:21 +0200)
committer GitHub <noreply@github.com>
Mon, 9 Jul 2018 07:21:14 +0000 (09:21 +0200)
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
diff --cc pdns/dnsdistdist/docs/reference/config.rst
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Mon, 9 Jul 2018 07:21:14 +0000 (09:21 +0200)
committer	GitHub <noreply@github.com>
	Mon, 9 Jul 2018 07:21:14 +0000 (09:21 +0200)
		1	2
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/reference/config.rst	patch \|	diff1 \|	diff2 \|	blob \| history