From: Dave Hart <hart@ntp.org>
Date: Wed, 28 Jun 2023 00:08:06 +0000 (+0000)
Subject: Merge tl.davehart.net:C:/ntp/stable/3831
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b82c8a17dc0bb4327e3b1be8988a68fca4286cf;p=thirdparty%2Fntp.git

Merge tl.davehart.net:C:/ntp/stable/3831
into  tl.davehart.net:C:/ntp/stable/ready-230627

bk: 649b79e6LmBagfnrSOflkv2kjzsAiQ
---

4b82c8a17dc0bb4327e3b1be8988a68fca4286cf
diff --cc ChangeLog
index 2de6c6831,252092bcf..edac831c2
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,5 +1,12 @@@
  ---
- * [Bug 3828] BK should ignore a git repo in the same directory.
-              <burnicki@ntp.org>
- * [Bug 3827] Fix build in case CLOCK_HOPF6021 or CLOCK_WHARTON_400A
-              is disabled.  <burnicki@ntp.org>
 +* [Bug 3825] Don't touch HTML files unless building inside a BK repo.
 +             Fix the script checkHtmlFileDates.  <burnicki@ntp.org>
++* [Bug 3827] Fix build in case CLOCK_HOPF6021 or CLOCK_WHARTON_400A
++             is disabled.  <burnicki@ntp.org>
++* [Bug 3828] BK should ignore a git repo in the same directory.
++             <burnicki@ntp.org>
+ * [Bug 3831] pollskewlist zeroed on runtime configuration. <hart@ntp.org>
 +* Add DSA, DSA-SHA, and SHA to tests/libntp/digests.c. <hart@ntp.org>
  
  ---
  (4.2.8p17) 2023/06/06 Released by Harlan Stenn <stenn@ntp.org>