From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 13 Dec 2007 08:55:24 +0000 (-0500)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c0ad61fdffcc9beb035e912d4f7152ba26827c2;p=thirdparty%2Fntp.git

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

bk: 4760f37c00u6mFb3rv2D6U-Wr2Qd9A
---

9c0ad61fdffcc9beb035e912d4f7152ba26827c2
diff --cc ChangeLog
index 04ba671fcb,e70d6656a0..e284130de2
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 830] Fix the checking order of the interface options
+ * Clean up the logfile/syslog setup.
  * [Bug 970] Lose obsolete -g flag to ntp-keygen.
  * The -e flag to ntp-keygen can write GQ keys now, too.
  * ntp_proto.c: sys_survivors and hpoll cleanup from Dave Mills.