From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 14 Feb 2018 12:36:07 +0000 (+0000)
Subject: [github55] Merge branch 'perfdhcp-late-exit-delay' of https://github.com/andreipavelQ... 
X-Git-Tag: trac5502_base~5^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=016a8b81c3ea51b12fbf751d502079db1eb36f47;p=thirdparty%2Fkea.git

[github55] Merge branch 'perfdhcp-late-exit-delay' of https://github.com/andreipavelQ/kea into github55

# Conflicts:
#	src/bin/perfdhcp/perfdhcp.xml
---

016a8b81c3ea51b12fbf751d502079db1eb36f47
diff --cc src/bin/perfdhcp/perfdhcp.xml
index 73504e0466,60af98323a..a81c3dcb85
--- a/src/bin/perfdhcp/perfdhcp.xml
+++ b/src/bin/perfdhcp/perfdhcp.xml
@@@ -711,14 -727,16 +711,18 @@@
                      <term><option>-D <replaceable class="parameter">max-drop</replaceable></option></term>
                      <listitem>
                          <para>
-                             Abort the test if more than <replaceable class="parameter">max-drop</replaceable>
-                             requests have been dropped.  Use <option>-D
+                             Abort the test immediately if <replaceable
+                             class="parameter">max-drop</replaceable> requests
 -                            have been dropped. <replaceable
++                            have been dropped.  Use <option>-D
 +                            0</option> to abort if even a single
-                             request has been dropped.  If <replaceable class="parameter">max-drop</replaceable> includes
-                             the suffix '%', it specifies a maximum percentage
-                             of requests that may be dropped before abort.
-                             In this case, testing of the threshold begins after
-                             10 requests have been expected to be received.
++                            request has been dropped. <replaceable
+                             class="parameter">max-drop</replaceable> must be a
+                             positive integer. If <replaceable
+                             class="parameter">max-drop</replaceable> includes
+                             the suffix '%', it specifies a maximum percentage of
+                             requests that may be dropped before abort. In this
+                             case, testing of the threshold begins after 10
+                             requests have been expected to be received.
                          </para>
                      </listitem>
                  </varlistentry>