merge cleanup

bk: 55b5a305nuaGfu7_scdFKWYnPazosA

diff --git a/ChangeLog b/ChangeLog
index 6f63b5289adaa19e592ccd8c6ab06b6d05c42b3e..f742c7d85d1a52656960cd16f54defa7c0eceef3 100644 (file)
--- 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.