Merge pull request #12473 from rgacogne/ddist-web-cache-mgmt

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

Fri, 27 Jan 2023 08:20:17 +0000 (09:20 +0100)

committer GitHub <noreply@github.com>

Fri, 27 Jan 2023 08:20:17 +0000 (09:20 +0100)
author Remi Gacogne <remi.gacogne@powerdns.com>
Fri, 27 Jan 2023 08:20:17 +0000 (09:20 +0100)
committer GitHub <noreply@github.com>
Fri, 27 Jan 2023 08:20:17 +0000 (09:20 +0100)
diff --cc pdns/dnsdist-web.cc
Simple merge
diff --cc tasks.py
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Fri, 27 Jan 2023 08:20:17 +0000 (09:20 +0100)
committer	GitHub <noreply@github.com>
	Fri, 27 Jan 2023 08:20:17 +0000 (09:20 +0100)
		1	2
pdns/dnsdist-web.cc	patch \|	diff1 \|	diff2 \|	blob \| history
tasks.py	patch \|	diff1 \|	diff2 \|	blob \| history