From: Tomasz Flendrich <tflendrich@ntp.org>
Date: Mon, 20 Jul 2015 15:11:53 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84d7f1b633755fbad4359c2125f8551538395eef;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
into  psp-deb1.ntp.org:/home/tflendrich/ntpd_tests/ntp-stable-unity

bk: 55ad0fb93qdBRoStr7C2ZYciVNOzQQ
---

84d7f1b633755fbad4359c2125f8551538395eef
diff --cc ChangeLog
index c05260ba8,080fb7702..3458205bc
--- a/ChangeLog
+++ b/ChangeLog
@@@ -77,7 -81,12 +81,13 @@@ fixed formatting. Tomasz Flendric
  * Don't build sntp/libevent/sample/.  Harlan Stenn.
  * tests/libntp/test_caltontp needs -lpthread.  Harlan Stenn.
  * br-flock: --enable-local-libevent.  Harlan Stenn.
 +* Wrote tests for ntpd/ntp_prio_q.c. Tomasz Flendrich
+ * scripts/lib/NTP/Util.pm: stratum output is version-dependent.  Harlan Stenn.
+ * Get rid of the NTP_ prefix on our assertion macros.  Harlan Stenn.
+ * Code cleanup.  Harlan Stenn.
+ * libntp/icom.c: Typo fix.  Harlan Stenn.
+ * util/ntptime.c: initialization nit.  Harlan Stenn.
+ * ntpd/ntp_peer.c:newpeer(): added a DEBUG_REQUIRE(srcadr).  Harlan Stenn.
  ---
  (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>