From: Juergen Perlinger <perlinger@ntp.org>
Date: Tue, 2 Dec 2014 03:11:36 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P482~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb598f1686173f6a769b5410afde7e50b4e7ea7f;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-deb1.ntp.org:/home/perlinger/ntp-dev-2678

bk: 547d2de8h8dNkoXTaFux_T-kvr2RbQ
---

bb598f1686173f6a769b5410afde7e50b4e7ea7f
diff --cc ChangeLog
index 056fb6705,748f6d262..f4a0514dd
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
+ * [Bug 2641] sntp is installed in the wrong location in Solaris.
 +* [Bug 2678] nmea_control() now checks 'refclock_params()' result.
  (4.2.7p481) 2014/11/22 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2314] Only enable PPS if kernel consumer binding succeeds.
  * [Bug 2314] Kernel PPS binding EOPNOTSUPP is a failure condition.