From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 30 Sep 2010 04:53:56 +0000 (-0400)
Subject: Merge bk://bk2.ntp.org./ntp-dev
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbf7a69901d8510836097747bd1b6031574dd151;p=thirdparty%2Fntp.git

Merge bk://bk2.ntp.org./ntp-dev
into  psp-deb1.ntp.org:/home/hart/ntp-dev-1646

bk: 4ca417e4xP5S1uLoHg75wAKChKxW8A
---

fbf7a69901d8510836097747bd1b6031574dd151
diff --cc ChangeLog
index 71e2744311,cfb5a95032..20c953ffd6
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,4 +1,10 @@@
 +* Clock select bugfix from Dave Mills.
 +* [Bug 1554]: peer may stay selected as system peer after becoming
 +  unreachable.
 +* [Bug 1644] from 4.2.6p3: cvo.sh should use lsb_release to identify
 +  linux distros.
+ * [Bug 1646] ntpd crashes with relative path to logfile.
 +(4.2.7p57) 2010/09/27 Released by Harlan Stenn <stenn@ntp.org>
  * Documentation updates from Dave Mills.
  (4.2.7p56) 2010/09/25 Released by Harlan Stenn <stenn@ntp.org>
  * Clock combining algorithm improvements from Dave Mills.