From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 14 Mar 2016 10:26:26 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f822e5a39e202616dd2b102ac6324b0556b7bf99;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7

bk: 56e691d2-4vBS3JVYyl9wrhReEVKvA
---

f822e5a39e202616dd2b102ac6324b0556b7bf99
diff --cc ChangeLog
index 8e864f1ba,5b14e9faf..19f3836f8
--- a/ChangeLog
+++ b/ChangeLog
@@@ -29,9 -12,8 +29,10 @@@
    - fixed memory leak in access list (auth[read]keys.c)
    - refactored handling of key access lists (auth[read]keys.c)
    - reduced number of error branches (authreadkeys.c)
+ * [Bug 3023] ntpdate cannot correct dates in the future. perlinger@ntp.org
  * Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
 +* Update html/xleave.html documentation.  Harlan Stenn.
 +* Update ntp.conf documentation.  Harlan Stenn.
  * Fix some Credit: attributions in the NEWS file.  Harlan Stenn.
  * Fix typo in html/monopt.html.  Harlan Stenn.