merge cleanup

bk: 55aca1ebK90jJDs3X1FSIT7evd_I4Q

diff --git a/ChangeLog b/ChangeLog
index f207e200bdb3ce34db37ba17fecbdcd2a2d5f324..73cb31ca2e056c33224aeb853b586d55f840f3b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 Below are from 4.2.8p4:
+* [Bug 2849] Systems with more than one default route may never
+  synchronize.  Brian Utterback.  Note that this patch might need to
+  be reverted once Bug 2043 has been fixed.
 * libntp/icom.c: Typo fix.  Harlan Stenn.
 * util/ntptime.c: initialization nit.  Harlan Stenn.
 (4.3.61) 2015/07/19 Released by Harlan Stenn <stenn@ntp.org>