From: Rob Neal <neal@ntp.org>
Date: Fri, 15 Jun 2007 23:20:45 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P53~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41438294a582be2cdddc43fcba4e08552f7c5e8e;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/neal/neal.ntp-dev

bk: 46731ecdTEixWF7ZygEDFZSdALeZHw
---

41438294a582be2cdddc43fcba4e08552f7c5e8e
diff --cc ChangeLog
index 00e5c120d,c83f3f849..77b0bba3c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
+ * Allow null driftfile.
 +* [Bug 853] get_node() must return a pointer to maximally-aligned memory.
 +* Leap file fixes from Dave Mills.
 +* [Bug 858] Recent leapfile changes broke without OPENSSL.
  * Use a char for DIR_SEP, not a string.
  * [Bug 850] driftfile parsing changes.
  * driftfile maintenance changes from Dave Mills.  Use clock_phi instead of