From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 2 Jul 2015 09:35:27 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2867
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ea871ef26deba04deb0e1bbfed347415f7d47d0;p=thirdparty%2Fntp.git

Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2867
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable

bk: 559505dfidA1Wj3KO4OeqMvc8pVJww
---

3ea871ef26deba04deb0e1bbfed347415f7d47d0
diff --cc ChangeLog
index 26ee0e80f,4dce12efb..feb47a14c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,7 @@@
  ---
  
 +* [Bug 2864] 4.2.8p3 fails to compile on Windows. Juergen Perlinger
+ * [Bug 2867] ntpd with autokey active crashed by 'ntpq -crv'. J.Perlinger
  ---
  (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>