From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 4 Jan 2017 10:58:27 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68029d86e53981ac88e0f9cb236506489b35bb75;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-2923

bk: 586cd553nGntZ25P2IL5e1OAdd-7WQ
---

68029d86e53981ac88e0f9cb236506489b35bb75
diff --cc ChangeLog
index c3aff26f9,b62b33799..b25e6592e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,6 +1,8 @@@
  ---
++
+ * [Bug 2923] Trap Configuration Fail <perlinger@ntp.org>
+   - fixed dependency inversion from [Bug 2837]
 +* Update copyright year.
  
  ---
  (4.2.8p9) 2016/11/21 Released by Harlan Stenn <stenn@ntp.org>