From: Dave Hart <hart@ntp.org>
Date: Sat, 2 May 2009 18:24:55 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d20bb7eb16128c4bce6024026b17ea335e8a7a53;p=thirdparty%2Fntp.git

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

bk: 49fc8ff7-niJPy2lQFrq_5bHOHqCTQ
---

d20bb7eb16128c4bce6024026b17ea335e8a7a53
diff --cc ChangeLog
index f008ac99b0,cdbf23096e..1d6839d312
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
+ * do not clear config.cache when it is already empty
 +(4.2.5p170) 2009/05/02 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1152] adjust PARSE to new refclock_pps logic
 +* Include (4.2.4p7-RC5)
  * loopfilter FLL/PLL crossover cleanup from Dave Mills.
  * Documentation updates from Dave Mills.
  * ntp-keygen cleanup from Dave Mills.