[master] ChangeLog, AUTHORS, COPYING updated after github36 merge.

diff --git a/AUTHORS b/AUTHORS
index 45efb9e7000e1d2c6e24376daed3bd3f2d803f4b..8525be933ed33ab39c3d0e963f8df4ebec4c3245 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -107,6 +107,8 @@ We have received the following contributions:
    2017-12: Significant update for Cassandra backend
    2018-01: Host reservations for Cassandra
    2018-01: Various changes (github 54)
+   2018-02: Support for Google benchmark added (github 36)
+
 
  - Patrik Lundin
    2016-07: Replace test by expr for < in configure.ac
@@ -137,6 +139,7 @@ We have received the following contributions:
    2018-01: Various changes (github 54,43)
    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)
 
  - Vincent Legout
    2016-11: Fixed serveral spelling mistakes

diff --git a/COPYING b/COPYING
index b637d80512fc3f1a5cd6fccd97c8fdf36c9a7b13..4181b44f0d957dfeed43928bf281fca53324aa80 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -7,9 +7,10 @@ text is also included below.
 
 -----------------------------------------------------------------------------
 
-The Cassandra backend code is distributed under the Apache License, Version 2.0.
-The text is available at http://www.apache.org/licenses/LICENSE-2.0. Full
-text is also included below in this file.
+The Cassandra backend code and support for Google benchmark is distributed under
+the Apache License, Version 2.0. The text is available at
+http://www.apache.org/licenses/LICENSE-2.0. Full text is also included below in
+this file. Both features are optional and are disabled by default.
 
 -----------------------------------------------------------------------------
 

diff --git a/ChangeLog b/ChangeLog
index 20a56252e3ac240865aa6de62fff99b99f1501ea..41d535843796fcd4fcbaaa8397cf40fb33e4da80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+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)
+
 1358.  [build,bug]     fdupont
        Cassandra build fixes for macOS.
-       (Trac #5494, git xxx)
+       (Trac #5494, git cb0d735628aefd6bca2acc11b73d1f66b45d1c40)
 
 1357.  [bug]           rcgoodfellow
-       Fixed bug in kea-admon causing error on lease-dump.
-       (github #61, git xxx)
+       Fixed bug in kea-admin causing error on lease-dump.
+       (github #61, git 2c9454ec56edc8f3cff8a23329f53ced0d172280)
 
 1356.  [func]          andreipavelQ,tomek
        The logging configuration is now applied early, which helps