merge cleanup

bk: 4bde875bPoJxL3qZH8B-kf4v0yACBg

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