From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 31 Dec 2010 01:52:33 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:/home/hart/ntp-dev-ntpq-simplecook
X-Git-Tag: NTP_4_2_7P107~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53bc60c900f095a45f91ab840e355e672b9bcb03;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/hart/ntp-dev-ntpq-simplecook
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d1d37613zh_u9hCPv71SsemQ4BNXA
---

53bc60c900f095a45f91ab840e355e672b9bcb03
diff --cc ChangeLog
index 38a88c707,0696748e9..f7fc4cea4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,7 +1,8 @@@
+ * [Bug 1764] Palisade driver doesn't build on Linux.
+ * Move ntp_control.h variable IDs to ntp_control.c, remove their use by
+   ntpq.  They are implementation details private to ntpd.  [Bug 597] was
+   caused by ntpq's reliance on these IDs it need not know about.
 +(4.2.7p106) 2010/12/30 Released by Harlan Stenn <stenn@ntp.org>
  * from 4.2.6p3: Update genCommitLog for the bk-5 release.
  (4.2.7p105) 2010/12/29 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.7p104) 2010/12/28 Released by Harlan Stenn <stenn@ntp.org>