From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 28 Jul 2010 03:06:59 +0000 (-0400)
Subject: Merge bk://maccarony/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c637e23220c7623534e06388d6efe035f8d6fa41;p=thirdparty%2Fntp.git

Merge bk://maccarony/ntp-dev
into  pogo.udel.edu:/pogo/users/hart/ntp-dev-1586

bk: 4c4f9ed3ec9qp7z0xGbiZdfmcYgcHg
---

c637e23220c7623534e06388d6efe035f8d6fa41
diff --cc ChangeLog
index ec3c7bad93,2b2bd22de1..9cf9b64d0b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
 +* [Bug 1586] ntpd 4.2.7p40 doesn't write to syslog after fork on QNX.
 +* Avoid race with parallel builds using same source directory in
 +  scripts/genver by using build directory for temporary files.
+ * orphanwait documentation updates.
  (4.2.7p40) 2010/07/12 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1395] ease ntpdate elimination with ntpd -w/--wait-sync
  * [Bug 1396] allow servers on ntpd command line like ntpdate