From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 27 Jul 2015 00:28:55 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_65~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd83943c46305d094e26a2c3ed1b8c6c8bdb99d8;p=thirdparty%2Fntp.git

merge cleanup

bk: 55b57b47SDF31o6NS3Q1P5dUv2e4VQ
---

diff --git a/ChangeLog b/ChangeLog
index 15b0ba892..b397a8323 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p4:
+* [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.
 (4.3.64) 2015/07/26 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * [Bug 2886] Mis-spelling: "outlyer" should be "outlier".  dave@horsfall.org