Merge pull request #6391 from rgacogne/dnsdist-dynblock-group

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

Wed, 28 Mar 2018 09:53:13 +0000 (11:53 +0200)

committer GitHub <noreply@github.com>

Wed, 28 Mar 2018 09:53:13 +0000 (11:53 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Wed, 28 Mar 2018 09:53:13 +0000 (11:53 +0200)
committer GitHub <noreply@github.com>
Wed, 28 Mar 2018 09:53:13 +0000 (11:53 +0200)
diff --cc pdns/dnsdist-console.cc
Simple merge
diff --cc pdns/dnsdist-lua-inspection.cc
Simple merge
diff --cc pdns/dnsdistdist/docs/reference/config.rst
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Wed, 28 Mar 2018 09:53:13 +0000 (11:53 +0200)
committer	GitHub <noreply@github.com>
	Wed, 28 Mar 2018 09:53:13 +0000 (11:53 +0200)
		1	2
pdns/dnsdist-console.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua-inspection.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/reference/config.rst	patch \|	diff1 \|	diff2 \|	blob \| history