Merge pull request #7694 from rgacogne/dnsdist-frontend-refactoring

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

Thu, 11 Apr 2019 08:26:44 +0000 (10:26 +0200)

committer GitHub <noreply@github.com>

Thu, 11 Apr 2019 08:26:44 +0000 (10:26 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Thu, 11 Apr 2019 08:26:44 +0000 (10:26 +0200)
committer GitHub <noreply@github.com>
Thu, 11 Apr 2019 08:26:44 +0000 (10:26 +0200)
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Thu, 11 Apr 2019 08:26:44 +0000 (10:26 +0200)
committer	GitHub <noreply@github.com>
	Thu, 11 Apr 2019 08:26:44 +0000 (10:26 +0200)
		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