[#2080] Update authors and changelog

diff --git a/AUTHORS b/AUTHORS
index 1056151279f82381e2d40cb2e035ad4686b2036d..dc63696a6c3f1c396baf3251788f5d0b88d65bb6 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,7 +17,6 @@ Primary developers:
  - Wlodek Wencel (testing, release engineering)
  - Francis Dupont (crypto, flex/bison parsers, perfdhcp, control agent,
                    radius, netconf, config backend, multi-threading)
- - Michal Nowikowski (testing, hammer, release engineering)
  - Razvan Becheriu (cassandra, netconf, multi-threading, forensic logging,
                     run script hook, multi-threading mode of high availability)
  - Vicky Risk (documentation)
@@ -25,12 +24,14 @@ Primary developers:
  - Andrei Pavel (build system, documentation, hammer, netconf, perfdhcp,
                  release engineering, shell scripts, testing)
  - Peter Davies (documentation)
+ - Slawek Figiel (documentation)
 
 Former developers who are no longer active:
  - Stephen Morris (Hooks, MySQL)
  - Jeremy C. Reed (documentation, build system, testing, release engineering)
  - Brian Reid (logo design)
  - Shawn Routhier (lease file cleanup)
+ - Michal Nowikowski (testing, hammer, release engineering)
 
 Main area of work mentioned in parentheses. The lists are in a roughly
 chronological order.

diff --git a/ChangeLog b/ChangeLog
index 95c526ab1674441cde8bacf13fa5988c18a7b267..f89a424cbf6e1d86d8649e01a18d05e10e4ef017 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1950.  [doc]           slawek
+       The description and example of the usage of the "include"
+       statement in the Kea configuration file.
+       (Gitalb #2080)
+
 1949.  [bug]           tmark
        kea-dhcp6 now correctly determines DNS update flags when
        the allocation engine dynamically changes the selected