Merge pull request #14976 from omoerbeek/rec-quit-nicely-sync

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Fri, 14 Feb 2025 07:28:02 +0000 (08:28 +0100)

committer GitHub <noreply@github.com>

Fri, 14 Feb 2025 07:28:02 +0000 (08:28 +0100)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 14 Feb 2025 07:28:02 +0000 (08:28 +0100)
committer GitHub <noreply@github.com>
Fri, 14 Feb 2025 07:28:02 +0000 (08:28 +0100)
diff --cc pdns/recursordist/Makefile.am
Simple merge
diff --cc pdns/recursordist/meson.build
Simple merge
diff --cc pdns/recursordist/rec-main.cc
Simple merge
diff --cc pdns/recursordist/rec-main.hh
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Fri, 14 Feb 2025 07:28:02 +0000 (08:28 +0100)
committer	GitHub <noreply@github.com>
	Fri, 14 Feb 2025 07:28:02 +0000 (08:28 +0100)
		1	2
pdns/recursordist/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/rec-main.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/rec-main.hh	patch \|	diff1 \|	diff2 \|	blob \| history