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

merge cleanup

bk: 55aca1ebK90jJDs3X1FSIT7evd_I4Q
---

diff --git a/ChangeLog b/ChangeLog
index f207e200b..73cb31ca2 100644
--- 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>