From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 14 Jan 2016 09:20:58 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f4edb3d57f7258af4eda2e27568ed7bb65eb483;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/perlinger/ntp-stable-2772

bk: 5697687alQX-EsvbaCd_oMFo0BKf0w
---

9f4edb3d57f7258af4eda2e27568ed7bb65eb483
diff --cc ChangeLog
index 304bd85ab,4a1b12a11..291d364df
--- a/ChangeLog
+++ b/ChangeLog
@@@ -18,9 -17,10 +18,10 @@@
  * CID 1341681: Nits in sntp/tests/keyFile.c.  HStenn.
  * CID 1341682: Nit in libntp/authreadkeys.c.  HStenn.
  * CID 1341684: Nit in tests/ntpd/t-ntp_signd.c.  HStenn.
+ * [Bug 2772] adj_systime overflows tv_usec. perlinger@ntp.org
  * [Bug 2829] Look at pipe_fds in ntpd.c  (did so. perlinger@ntp.org)
  * [Bug 2887] stratum -1 config results as showing value 99
 -  - fudge stratum only accepts values [0..16]. perlinger@ntp.org
 +  - fudge stratum should only accept values [0..16]. perlinger@ntp.org
  * [Bug 2932] Update leapsecond file info in miscopt.html.  CWoodbury, HStenn.
  * [Bug 2934] tests/ntpd/t-ntp_scanner.c has a magic constant wired in.  HMurray
  * [Bug 2944] errno is not preserved properly in ntpdate after sendto call.