From: NTP Release Engineering <stenn@ntp.org>
Date: Fri, 8 Nov 2024 07:38:50 +0000 (-0800)
Subject: Merge ntp-testbuild:/home/nfs1.tal1/harlan/ntp/ntp-stable
X-Git-Tag: NTP_4_3_106~1^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17cb4426c624d66c09b0e1cc4ba79eab5fc87b67;p=thirdparty%2Fntp.git

Merge ntp-testbuild:/home/nfs1.tal1/harlan/ntp/ntp-stable
into  ntp-build.tal1.ntfo.org:/ntpbuild/data/master/ntp-stable

bk: 672dc00awh2uSNXZX-8C37PMxHWPUA
---

17cb4426c624d66c09b0e1cc4ba79eab5fc87b67
diff --cc ChangeLog
index dad7b483b,873386c1d..679bbe0bb
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,8 @@@
  ---
 -
 +* 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>
+ * Author attribution updates
  
  ---
  (4.2.8p18) 2024/05/25 Released by Harlan Stenn <stenn@ntp.org>