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

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

bk: 50a2dd71rmj9rz3uxDrmdYBEw5Rc0Q
---

0de620cad20980db59b078faf53d0e92ee70cb82
diff --cc ChangeLog
index e16b73375,4213ee0a5..85a5f0fc3
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,7 @@@
 +* [Bug 1223] Allow configurable values for RLIMIT_STACK and
 +  RLIMIT_MEMLOCK.
+ * [Bug 1320] Log ntpd's initial command-line parameters. (updated fix)
+ (4.2.7p321) 2012/11/13 Released by Harlan Stenn <stenn@ntp.org>
  * [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.