From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 3 May 2010 08:20:43 +0000 (-0400)
Subject: merge cleanup
X-Git-Tag: NTP_4_2_7P28~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06e8878d8ab0158bb9451bbe83ffd7813fefacd2;p=thirdparty%2Fntp.git

merge cleanup

bk: 4bde875bPoJxL3qZH8B-kf4v0yACBg
---

diff --git a/ChangeLog b/ChangeLog
index f525321c1..eb7d227f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+* Include (4.2.6p2-RC3) [Bug 1512] ntpsnmpd should connect to net-snmpd
+  via a unix-domain socket by default.
+  Provide a command-line 'socket name' option.
+* Include (4.2.6p2-RC3) [Bug 1538] update refclock_nmea.c's call to
+  getprotobyname().
 (4.2.7p27) 2010/04/27 Released by Harlan Stenn <stenn@ntp.org>
 (4.2.7p26) 2010/04/24 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1465] Make sure time from TS2100 is not invalid (backport from -dev).