From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 20 Nov 2012 04:46:25 +0000 (-0800)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P326~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14bae4a2cc0a2d790e770e63a774afca0f1ee14f;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  hms-mbp11.local:/Users/harlan/src/ntp-dev-dlm

bk: 50ab0b21tyJZT6RxEAOBfvmwGUYFAw
---

14bae4a2cc0a2d790e770e63a774afca0f1ee14f
diff --cc ChangeLog
index 5d041c985,849299cfc..59a487ad5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,5 +1,8 @@@
+ * [Bug 1214] 'proto: precision = ...' should be at INFO, not NOTICE.
 +* [Bug 2202] ntpq.html: there is no "acv" billboard.
+ * [Bug 2246] Clear sys_leap when voting says to disarm the leap.
 +* [Bug 2306] keep pps hack for Win32 even if user-mode/loopback
 +  PPS API is activated on a serial line.
  (4.2.7p324) 2012/11/19 Released by Harlan Stenn <stenn@ntp.org>
  * Reinstate doc fix to authentic.html from Mike T.
  * [Bug 1223] cleanup for rlimit changes.