From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 5 Jul 2013 00:48:38 +0000 (-0400)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da67437fb36519552d450ea1a80e96b2ba176d02;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-deb1.ntp.org:/home/stenn/ntp-dev

bk: 51d617e6s5seF9ogQFSno_AVXaBAlw
---

da67437fb36519552d450ea1a80e96b2ba176d02
diff --cc ChangeLog
index 8a13b17651,670046e9f8..866eca0bd9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,4 +1,11 @@@
+ * Fix ntpsweep to use sntp instead of ntpdate, from Oliver Kindernay.
 +(4.2.7p368) 2013/05/01 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2145] ntpq dumps core when displaying sys_var_list and more.
 +(4.2.7p367) 2013/04/25 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1485] Sometimes ntpd crashes
 +* [Bug 2382] Implement LOGTOD using ldexp() instead of shifting.
 +(4.2.7p366) 2013/04/17 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1866] Disable some debugging output in refclock_oncore.
  (4.2.7p365) 2013/04/16 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2149] Log an error message if /proc/net/if_inet6 cannot be opened.
  (4.2.7p364) 2013/03/26 Released by Harlan Stenn <stenn@ntp.org>