Merge pull request #8505 from rgacogne/dnsdist-lua-ffi

author Remi Gacogne <remi.gacogne@powerdns.com>

Tue, 18 Feb 2020 13:37:11 +0000 (14:37 +0100)

committer GitHub <noreply@github.com>

Tue, 18 Feb 2020 13:37:11 +0000 (14:37 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Tue, 18 Feb 2020 13:37:11 +0000 (14:37 +0100)
committer GitHub <noreply@github.com>
Tue, 18 Feb 2020 13:37:11 +0000 (14:37 +0100)
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist-web.cc
Simple merge
diff --cc regression-tests.dnsdist/test_DOH.py
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Tue, 18 Feb 2020 13:37:11 +0000 (14:37 +0100)
committer	GitHub <noreply@github.com>
	Tue, 18 Feb 2020 13:37:11 +0000 (14:37 +0100)
		1	2
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-web.cc	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.dnsdist/test_DOH.py	patch \|	diff1 \|	diff2 \|	blob \| history