From: Dave Hart <hart@ntp.org>
Date: Sun, 17 Apr 2011 20:06:18 +0000 (+0000)
Subject: Merge bk://bk.ntp.org./ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=960fdbe980629e739781cd2fc6d5f86d84142176;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org./ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-dnsfix

bk: 4dab483aBR55HHA4crQ2bpL969fyEw
---

960fdbe980629e739781cd2fc6d5f86d84142176
diff --cc ChangeLog
index 4c137bb25d,b2ed92a379..7b074e5d3b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,6 @@@
+ (4.2.7p154) 2011/04/17 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1887] DNS fails on 4.2.7p153 using threads.
 +* Fix leak in refclock_datum.c start failure path.
  (4.2.7p153) 2011/04/16 Released by Harlan Stenn <stenn@ntp.org>
  * A few more Coverity Scan cleanups.
  (4.2.7p152) 2011/04/15 Released by Harlan Stenn <stenn@ntp.org>