Merge pull request #7087 from phonedph1/dynpool

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

Tue, 20 Nov 2018 11:01:57 +0000 (12:01 +0100)

committer GitHub <noreply@github.com>

Tue, 20 Nov 2018 11:01:57 +0000 (12:01 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 20 Nov 2018 11:01:57 +0000 (12:01 +0100)
committer GitHub <noreply@github.com>
Tue, 20 Nov 2018 11:01:57 +0000 (12:01 +0100)
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Tue, 20 Nov 2018 11:01:57 +0000 (12:01 +0100)
committer	GitHub <noreply@github.com>
	Tue, 20 Nov 2018 11:01:57 +0000 (12:01 +0100)
		1	2
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history