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

merge cleanup

bk: 55b5a305nuaGfu7_scdFKWYnPazosA
---

diff --git a/ChangeLog b/ChangeLog
index 6f63b5289..f742c7d85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 Below are from 4.2.8p4:
+* [Bug 2625] Deprecate flag1 in local refclock.  Hal Murray, Harlan Stenn.
 * [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.
 * Wrote tests for ntpd/ntp_prio_q.c. Tomasz Flendrich
 * ntpd/ntp_restrict.c: added a few assertions, created tests for this file.