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

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

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.
 
 -----------------------------------------------------------------------------
 

ChangeLog

+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