Merge branch 'master' into empty_response

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

Thu, 21 Feb 2019 16:28:17 +0000 (17:28 +0100)

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

Thu, 21 Feb 2019 16:28:17 +0000 (17:28 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Thu, 21 Feb 2019 16:28:17 +0000 (17:28 +0100)
committer Remi Gacogne <remi.gacogne@powerdns.com>
Thu, 21 Feb 2019 16:28:17 +0000 (17:28 +0100)
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
diff --cc pdns/dnsdistdist/docs/reference/config.rst
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Thu, 21 Feb 2019 16:28:17 +0000 (17:28 +0100)
committer	Remi Gacogne <remi.gacogne@powerdns.com>
	Thu, 21 Feb 2019 16:28:17 +0000 (17:28 +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
pdns/dnsdistdist/docs/reference/config.rst	patch \|	diff1 \|	diff2 \|	blob \| history