From: NTP Release Engineering <stenn@ntp.org>
Date: Thu, 19 Dec 2024 10:33:56 +0000 (-0800)
Subject: Merge ntp-build.tal1.ntfo.org:/home/localhost/u1/ntpreleng/ntp-stable
X-Git-Tag: NTP_4_3_107~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=489651adde34e8bd3606c535f6aa2398e6e82221;p=thirdparty%2Fntp.git

Merge ntp-build.tal1.ntfo.org:/home/localhost/u1/ntpreleng/ntp-stable
into  ntp-build.tal1.ntfo.org:/ntpbuild/data/master/ntp-dev

bk: 6763f6943_jgiXmcqvFre3jLIDYbzw
---

489651adde34e8bd3606c535f6aa2398e6e82221
diff --cc ChangeLog
index a07835d64,ac5c8fb7c..4cabc1d39
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,11 @@@
+ ---
+ * [Bug 3960] Remove duplicate ntp.conf.def content, reported by
+              Ulrich Windl. <stenn@ntp.org>
  * Makefile.am: Fix distcheck problem with check-local.  <stenn@ntp.org>
  * Add .github to the top-level tree. <dlavigne@nwtime.org>
 +	
 +(4.3.106) 2024/11/28 Released by Harlan Stenn <stenn@ntp.org>
 +
  * build script: Use hostname.site for NTF build hosts.  Use the full
    hostname for the buildkey.  <stenn@ntp.org>
  * flock-build: Try to use the full hostname for the buildkey.  <stenn@ntp.org>