Merge pull request #9993 from rgacogne/ddist-offensive-terms

author Remi Gacogne <rgacogne+github@valombre.net>

Wed, 20 Jan 2021 10:54:09 +0000 (11:54 +0100)

committer GitHub <noreply@github.com>

Wed, 20 Jan 2021 10:54:09 +0000 (11:54 +0100)
author Remi Gacogne <rgacogne+github@valombre.net>
Wed, 20 Jan 2021 10:54:09 +0000 (11:54 +0100)
committer GitHub <noreply@github.com>
Wed, 20 Jan 2021 10:54:09 +0000 (11:54 +0100)
diff --cc pdns/dnsdist-console.cc
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist-snmp.cc
Simple merge
author	Remi Gacogne <rgacogne+github@valombre.net>
	Wed, 20 Jan 2021 10:54:09 +0000 (11:54 +0100)
committer	GitHub <noreply@github.com>
	Wed, 20 Jan 2021 10:54:09 +0000 (11:54 +0100)
		1	2
pdns/dnsdist-console.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-snmp.cc	patch \|	diff1 \|	diff2 \|	blob \| history