From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 14 Feb 2018 13:51:01 +0000 (+0000)
Subject: [master] ChangeLog, AUTHORS updated after github 55 merge
X-Git-Tag: trac5502_base~5^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86fcf22cd564939bb7be79af0a4b641e5d1e8940;p=thirdparty%2Fkea.git

[master] ChangeLog, AUTHORS updated after github 55 merge
---

diff --git a/AUTHORS b/AUTHORS
index 8525be933e..067fb79ca2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -108,7 +108,7 @@ We have received the following contributions:
    2018-01: Host reservations for Cassandra
    2018-01: Various changes (github 54)
    2018-02: Support for Google benchmark added (github 36)
-
+   2018-02: exit-wait-time param added to perfdhcp (github 55)
 
  - Patrik Lundin
    2016-07: Replace test by expr for < in configure.ac
@@ -140,6 +140,7 @@ We have received the following contributions:
    2018-02: Documentation upgraded to DocBook 5.0
    2018-02: --with-dhcp-XXX renamed to --with-XXX
    2018-02: Support for Google benchmark added (github 36)
+   2018-02: exit-wait-time param added to perfdhcp (github 55)
 
  - Vincent Legout
    2016-11: Fixed serveral spelling mistakes
diff --git a/ChangeLog b/ChangeLog
index 41d5358437..ce67e178b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+1360.	[func]		razvan, andrei
+	A new parameter exit-wait-time has been added to perfdhcp. It is
+	now possible to tell perfdhcp to wait certain amount of time after
+	exit conditions are met before actuallying terminating.
+	(github #55, git 0cd1178ae092fa0c2f122d0e16fb673b4074a6e6)
+
 1359.	[func]		razvan, andrei, tomek
 	Support for Google Benchmark has been added. To compile
 	benchmarking support, please use --with-benchmark option.
-	(Github 36, git tbd)
+	(Github #36, git d6819971410b460d7742c762844e2e75ba580944)
 
 1358.	[build,bug]	fdupont
 	Cassandra build fixes for macOS.