]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 3 Dec 2018 08:41:28 +0000 (03:41 -0500)
committerHarlan Stenn <stenn@ntp.org>
Mon, 3 Dec 2018 08:41:28 +0000 (03:41 -0500)
into  psp-fb1.ntp.org:/a/etc/amd.net/nfs-stor0.ntfo.org/root/nfs/home/stenn/ntp-stable-3526

bk: 5c04ec38h2vKTpsKLZffRPkDW5_rhA

1  2 
ChangeLog

diff --cc ChangeLog
index d33997215584fe6ccabdb71e962eabfe945500f1,0da56b835246a6f21998132c51599a6c196e47f6..0f8346ff6a9eac03e41d4f74c9abfc1c568556b4
+++ b/ChangeLog
@@@ -1,6 -1,8 +1,10 @@@
  ---
+ (4.2.8p13)
 +* [Bug 3526] Incorrect poll interval in packet <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
+ * [Bug 3471] Check for openssl/[ch]mac.h.  <perlinger@ntp.org>
+   - added missing check, reported by Reinhard Max <perlinger@ntp.org>
  
  ---
  (4.2.8p12) 2018/08/14 Released by Harlan Stenn <stenn@ntp.org>