From: Dave Hart <hart@ntp.org>
Date: Mon, 21 Sep 2009 00:18:48 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P218~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=424a7bf6842b43b913b93e4a68aaafb1b888fb98;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1314

bk: 4ab6c668NN9Qd3-JGyDtpeEL-TmT-g
---

424a7bf6842b43b913b93e4a68aaafb1b888fb98
diff --cc ChangeLog
index f2513dc97,5b7603fb3..9536cbc48
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,7 +1,8 @@@
+ * [Bug 1314] saveconfig emits -4 and -6 on when not given.
+ * clarify (former) NO_ARG, SINGLE_ARG, MULTIPLE_ARG renaming to
+   FOLLBY_TOKEN, FOLLBY_STRING, FOLLBY_STRINGS_TO_EOC.
+ * parser, saveconfig cleanup to store T_ identifiers in syntax tree.
 +(4.2.5p217) 2009/09/20 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1300] reject remote configuration of dangerous items.
  (4.2.5p216) 2009/09/19 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1312] ntpq/ntpdc MD5 passwords truncated to 8 chars on Suns.