Merge pull request #10527 from rgacogne/ddist-log-reload

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

Wed, 7 Jul 2021 10:09:09 +0000 (12:09 +0200)

committer GitHub <noreply@github.com>

Wed, 7 Jul 2021 10:09:09 +0000 (12:09 +0200)
author Remi Gacogne <remi.gacogne@powerdns.com>
Wed, 7 Jul 2021 10:09:09 +0000 (12:09 +0200)
committer GitHub <noreply@github.com>
Wed, 7 Jul 2021 10:09:09 +0000 (12:09 +0200)
diff --cc pdns/dnsdist-lua-actions.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
diff --cc pdns/dnsdistdist/docs/rules-actions.rst
Simple merge
author	Remi Gacogne <remi.gacogne@powerdns.com>
	Wed, 7 Jul 2021 10:09:09 +0000 (12:09 +0200)
committer	GitHub <noreply@github.com>
	Wed, 7 Jul 2021 10:09:09 +0000 (12:09 +0200)
		1	2
pdns/dnsdist-lua-actions.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdistdist/docs/rules-actions.rst	patch \|	diff1 \|	diff2 \|	blob \| history