From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 13 Nov 2012 09:07:48 +0000 (-0500)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P322~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfd82997bd2dee3f7c97f9d70136e78201715eab;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-deb1.ntp.org:/home/stenn/ntp-dev-1223

bk: 50a20de4MxSap1UVhX14HljNjia2lQ
---

cfd82997bd2dee3f7c97f9d70136e78201715eab
diff --cc ChangeLog
index 131f2db44,303bbdd08..e16b73375
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,6 @@@
 +* [Bug 1223] Allow configurable values for RLIMIT_STACK and
 +  RLIMIT_MEMLOCK.
+ * [Bug 1320] Log ntpd's initial command-line parameters.
  (4.2.7p320) 2012/11/12 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 969] Clarify ntpdate.html documentation about -u and ntpd.
  * [Bug 1217] libisc/ifiter_sysctl.c:internal_current(): Ignore RTM