From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 7 Aug 2013 09:41:31 +0000 (-0400)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P381~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aead5da9d942edc3f6637f396614d39e680e1b0;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/kardel/current/ntp-dev-2452

bk: 5202164bBfsLUGxo2RXCFOyBldhsEQ
---

6aead5da9d942edc3f6637f396614d39e680e1b0
diff --cc ChangeLog
index 6fb01f99c,d73c18ae1..8941c5c68
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,7 +1,9 @@@
+ * [Bug 2451] rlimit command is missing from the table of contents in
+   miscopt.html .
 +* [Bug 2452] provide io_handler/input_handler only on
 +  non HAVE_IO_COMPLETION_PORT platforms
+ * [Bug 2453] Need a way to avoid calling mlockall. 
+ * [Bug 2454] Need way to set file descriptor limit. 
  (4.2.7p380) 2013/08/03 Released by Harlan Stenn <stenn@ntp.org>
  * CID 984511: Some systems have different printf needs for sizeof.
  (4.2.7p379) 2013/08/02 Released by Harlan Stenn <stenn@ntp.org>