From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 8 Apr 2014 07:59:55 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P440~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c54e34f2e4724cfb273724913b5991a6ee753da3;p=thirdparty%2Fntp.git

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

bk: 5343ac7bz2KWQauLustvFjSgxvjqtg
---

c54e34f2e4724cfb273724913b5991a6ee753da3
diff --cc ChangeLog
index 2ed91c998,5bb13ae9f..e8f247134
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
+ * [Bug 2536] ntpd sandboxing support (libseccomp2) cleanup.
 +* [Bug 2570] cleanup: fix log format for successful leapfile load
+ (4.2.7p439) 2014/04/03 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2589] fix VS2009 compile problem.
  (4.2.7p438) 2014/04/01 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2546] Windows build documentation updates.