Merge pull request #5929 from rgacogne/dnsdist-check-class

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

Fri, 15 Dec 2017 10:48:47 +0000 (11:48 +0100)

committer GitHub <noreply@github.com>

Fri, 15 Dec 2017 10:48:47 +0000 (11:48 +0100)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Fri, 15 Dec 2017 10:48:47 +0000 (11:48 +0100)
committer GitHub <noreply@github.com>
Fri, 15 Dec 2017 10:48:47 +0000 (11:48 +0100)
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdistdist/docs/reference/config.rst
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Fri, 15 Dec 2017 10:48:47 +0000 (11:48 +0100)
committer	GitHub <noreply@github.com>
	Fri, 15 Dec 2017 10:48:47 +0000 (11:48 +0100)
		1	2
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/reference/config.rst	patch \|	diff1 \|	diff2 \|	blob \| history