From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 31 Aug 2008 06:35:24 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=343d1611e45c806ab5ca254150a22c6791da8ffb;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/gopal/repos/ntp-dev-610

bk: 48ba3bacBa-n7qSjLr8kwUHKUGsu-A
---

343d1611e45c806ab5ca254150a22c6791da8ffb
diff --cc ChangeLog
index ca046a3546,ec01f51de6..6f54cee4cf
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,9 +1,10 @@@
 +* [BUG 610] Documentation update for NMEA reference clock driver.
+ * [Bug 828] Fix IPv4/IPv6 address parsing.
+ * Changes from Dave Mills:
+   Documentation updates.
+   Fix a corner case where a frequency update was reported but not set.
+   When LEAP_NOTINSYNC->LEAP_NOWARNING, call crypto_update() if we have
+   crypto_flags.
  (4.2.5p125) 2008/08/18 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1052] Add linuxPPS support to ONCORE driver.
  (4.2.5p124) 2008/08/17 Released by Harlan Stenn <stenn@ntp.org>