From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 14 Jan 2016 11:33:43 +0000 (+0000)
Subject: merge cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1568f95a1fc39d9e60b2a14981adc7ef97b56b1;p=thirdparty%2Fntp.git

merge cleanup

bk: 56978797uuiTShYJCo035UKOg1AZ4A
---

diff --git a/ChangeLog b/ChangeLog
index 65cbf28f3..864175543 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
   - Found this already fixed, but validation led to cleanup actions.
 * [Bug 2905] DNS lookups broken. perlinger@ntp.org
   - added limits to stack consumption, fixed some return code handling
+* [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call
+  - changed stacked/nested handling of CTRL-C. perlinger@ntp.org
+  - make CTRL-C work for retrieval and printing od MRU list. perlinger@ntp.org
 * Make leapsec_query debug messages less verbose.  Harlan Stenn.
 
 ---