fixed merge

diff --git a/src/bin/perfdhcp/command_options.cc b/src/bin/perfdhcp/command_options.cc
index 7d6babffc84f6328a37b46a53f152ab248dced60..3a12cc247c1d28ecc41e8d0f9795f9a686d08f5c 100644 (file)
--- a/src/bin/perfdhcp/command_options.cc
+++ b/src/bin/perfdhcp/command_options.cc
@@ -370,9 +370,8 @@ CommandOptions::initialize(int argc, char** argv, bool print_cmd_line) {
             break;
 
         case 'W':
-            // 'm' for moratorium
             exit_wait_time_ = nonNegativeInteger("value of exist wait time: "
-                                                  "-m<value> must not be a "
+                                                  "-W<value> must not be a "
                                                   "negative integer");
             break;
 
@@ -989,7 +988,7 @@ CommandOptions::usage() const {
         "         [-n<num-request>] [-p<test-period>] [-d<drop-time>]\n"
         "         [-D<max-drop>] [-l<local-addr|interface>] [-P<preload>]\n"
         "         [-a<aggressivity>] [-L<local-port>] [-s<seed>] [-i] [-B]\n"
-        "         [-m<late-exit-delay>]\n"
+        "         [-W<late-exit-delay>]\n"
         "         [-c] [-1] [-M<mac-list-file>] [-T<template-file>]\n"
         "         [-X<xid-offset>] [-O<random-offset] [-E<time-offset>]\n"
         "         [-S<srvid-offset>] [-I<ip-offset>] [-x<diagnostic-selector>]\n"

diff --git a/src/lib/dhcpsrv/benchmarks/benchmarks.dox b/src/lib/dhcpsrv/benchmarks/benchmarks.dox
index 8e5327b3ce4af9e2d5665311f50e66df006cd994..98dc88a4480fd19efbb478c8be8c95139aa8ffb9 100644 (file)
--- a/src/lib/dhcpsrv/benchmarks/benchmarks.dox
+++ b/src/lib/dhcpsrv/benchmarks/benchmarks.dox
@@ -23,7 +23,7 @@ $ make
 The benchmarks are built in @b src/lib/dhcpsrv/benchmarks directory.
 Note that the benchmarks are backend-specific, so please make sure you
 enable the backends you want to measure (See --with-mysql,
---with-pgsql --with-cql parameters for configure). Once the
+--with-pgsql, --with-cql parameters for configure). Once the
 benchmark is built, you can run specific benchmarks. Make sure you
 have the environment ready for use, i.e. the actual database backend
 is set up, the DB or keyspace is created. The setup is the same as for