Merge pull request #6760 from rgacogne/dnsdist-dynblockrulesgroup-exclusions

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

Fri, 6 Jul 2018 08:14:33 +0000 (10:14 +0200)

committer GitHub <noreply@github.com>

Fri, 6 Jul 2018 08:14:33 +0000 (10:14 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Fri, 6 Jul 2018 08:14:33 +0000 (10:14 +0200)
committer GitHub <noreply@github.com>
Fri, 6 Jul 2018 08:14:33 +0000 (10:14 +0200)
diff --cc pdns/dnsdistdist/docs/reference/config.rst
Simple merge
diff --cc regression-tests.dnsdist/test_DynBlocks.py
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Fri, 6 Jul 2018 08:14:33 +0000 (10:14 +0200)
committer	GitHub <noreply@github.com>
	Fri, 6 Jul 2018 08:14:33 +0000 (10:14 +0200)
		1	2
pdns/dnsdistdist/docs/reference/config.rst	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.dnsdist/test_DynBlocks.py	patch \|	diff1 \|	diff2 \|	blob \| history