From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 16 Sep 2009 09:06:38 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P213~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a57765c4b5d1f5127f6890f66c0ac7b0c57adaf4;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/murray/bug-1310a

bk: 4ab0aa9e9gae0LjcOvB9yQ2cCXHBmw
---

a57765c4b5d1f5127f6890f66c0ac7b0c57adaf4
diff --cc ChangeLog
index ab864a7ef,b52342e3b..59c6d7ae1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
+ * [Bug 1310] fix Thunderbolt mode in refclock_palisade.c
 +(4.2.5p212) 2009/09/15 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 983] add interface [listen | ignore | drop] ... directive.
  * [Bug 1243] MD5auth_setkey zero-fills key from first zero octet.
  * [Bug 1295] leftover fix, do not crash on exit in free_config_trap()