Merge pull request #7075 from rgacogne/dnsdist-dynblock-nxd

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Fri, 26 Oct 2018 11:29:15 +0000 (13:29 +0200)

committer GitHub <noreply@github.com>

Fri, 26 Oct 2018 11:29:15 +0000 (13:29 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Fri, 26 Oct 2018 11:29:15 +0000 (13:29 +0200)
committer GitHub <noreply@github.com>
Fri, 26 Oct 2018 11:29:15 +0000 (13:29 +0200)
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdistdist/docs/reference/config.rst
Simple merge
diff --cc regression-tests.dnsdist/test_DynBlocks.py
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Fri, 26 Oct 2018 11:29:15 +0000 (13:29 +0200)
committer	GitHub <noreply@github.com>
	Fri, 26 Oct 2018 11:29:15 +0000 (13:29 +0200)
		1	2
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/reference/config.rst	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.dnsdist/test_DynBlocks.py	patch \|	diff1 \|	diff2 \|	blob \| history