Merge pull request #9379 from rgacogne/ddist-clear-console-history

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

Thu, 27 Aug 2020 08:29:34 +0000 (10:29 +0200)

committer GitHub <noreply@github.com>

Thu, 27 Aug 2020 08:29:34 +0000 (10:29 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Thu, 27 Aug 2020 08:29:34 +0000 (10:29 +0200)
committer GitHub <noreply@github.com>
Thu, 27 Aug 2020 08:29:34 +0000 (10:29 +0200)
diff --cc pdns/dnsdist-console.cc
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdistdist/docs/reference/config.rst
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Thu, 27 Aug 2020 08:29:34 +0000 (10:29 +0200)
committer	GitHub <noreply@github.com>
	Thu, 27 Aug 2020 08:29:34 +0000 (10:29 +0200)
		1	2
pdns/dnsdist-console.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/reference/config.rst	patch \|	diff1 \|	diff2 \|	blob \| history