Merge remote-tracking branch 'isc-kea/master' into HEAD

diff --cc AUTHORS
Simple merge

diff --cc doc/guide/dhcp4-srv.xml
Simple merge

diff --cc doc/guide/dhcp6-srv.xml
Simple merge

diff --cc src/bin/admin/kea-admin.in
Simple merge

diff --cc src/bin/dhcp6/tests/get_config_unittest.cc
Simple merge

diff --cc src/lib/dhcpsrv/Makefile.am
index 2e359366f0af09b29acc1ee972b4b6bb09c92d05,cc3e14863405fd9639dbbbe44758be064cde7223..f52edf905e3023b14b4f233d92182252b396d1d2
--- 1/src/lib/dhcpsrv/Makefile.am
--- 2/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@@ -146,14 -147,12 +148,15 @@@ libkea_dhcpsrv_la_SOURCES += pgsql_exch
  libkea_dhcpsrv_la_SOURCES += pgsql_host_data_source.cc pgsql_host_data_source.h
  libkea_dhcpsrv_la_SOURCES += pgsql_lease_mgr.cc pgsql_lease_mgr.h
  endif
 +
  if HAVE_CQL
 -libkea_dhcpsrv_la_SOURCES += cql_lease_mgr.cc cql_lease_mgr.h
  libkea_dhcpsrv_la_SOURCES += cql_connection.cc cql_connection.h
 +libkea_dhcpsrv_la_SOURCES += cql_exchange.cc cql_exchange.h
 +libkea_dhcpsrv_la_SOURCES += cql_lease_mgr.cc cql_lease_mgr.h
  endif
 +
  libkea_dhcpsrv_la_SOURCES += pool.cc pool.h
+ libkea_dhcpsrv_la_SOURCES += shared_network.cc shared_network.h
  libkea_dhcpsrv_la_SOURCES += srv_config.cc srv_config.h
  libkea_dhcpsrv_la_SOURCES += subnet.cc subnet.h
  libkea_dhcpsrv_la_SOURCES += subnet_id.h

diff --cc src/lib/dhcpsrv/cfg_option.cc
Simple merge

diff --cc src/lib/dhcpsrv/dhcpsrv_messages.mes
Simple merge

diff --cc src/lib/dhcpsrv/tests/Makefile.am
Simple merge