Merge branch 'isc-master' into minor-changes

diff --cc doc/guide/Makefile.am
Simple merge

diff --cc src/bin/admin/admin-utils.sh
Simple merge

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

diff --cc src/bin/d2/Makefile.am
Simple merge

diff --cc src/bin/d2/tests/d2_update_message_unittests.cc
Simple merge

diff --cc src/bin/d2/tests/dns_client_unittests.cc
Simple merge

diff --cc src/bin/dhcp4/Makefile.am
Simple merge

diff --cc src/bin/dhcp4/dhcp4_messages.mes
Simple merge

diff --cc src/bin/dhcp4/dhcp4_srv.h
Simple merge

diff --cc src/bin/dhcp4/dhcp4to6_ipc.cc
Simple merge

diff --cc src/lib/asiolink/io_address.h
Simple merge

diff --cc src/lib/dhcp/option_definition.cc
Simple merge

diff --cc src/lib/dhcp/tests/option_definition_unittest.cc
Simple merge

diff --cc src/lib/dhcp_ddns/tests/ncr_udp_unittests.cc
Simple merge

diff --cc src/lib/dhcpsrv/alloc_engine.h
Simple merge

diff --cc src/lib/dhcpsrv/base_host_data_source.h
Simple merge

diff --cc src/lib/dhcpsrv/host_mgr.h
Simple merge

diff --cc src/lib/dhcpsrv/parsers/dhcp_parsers.cc
Simple merge

diff --cc src/lib/dhcpsrv/pgsql_connection.h
index 8e7fe884c896b48897d0d75fa1600a45a9876ee2,9788972535794e2f975a053da61166d58f87ef8d..35e1644d642139d869af6fcdbd50a386c83cbcbb
--- 1/src/lib/dhcpsrv/pgsql_connection.h
--- 2/src/lib/dhcpsrv/pgsql_connection.h
+++ b/src/lib/dhcpsrv/pgsql_connection.h
@@@ -23,7 -27,7 +27,7 @@@ const uint32_t PG_SCHEMA_VERSION_MINOR 
  // statement.
  const size_t PGSQL_MAX_PARAMETERS_IN_QUERY = 32;
  
- /// @brief Define a PostgreSQL statement
 -/// @brief Define a PostgreSQL SQL statement
++/// @brief Define a PostgreSQL statement.
  ///
  /// Each statement is associated with an index, which is used to reference the
  /// associated prepared statement.
@@@ -45,10 -49,10 +49,11 @@@ struct PgSqlTaggedStatement 
      const char* text;
  };
  
 +/// @{
  /// @brief Constants for PostgreSQL data types
- /// This are defined by PostgreSQL in <catalog/pg_type.h>, but including
+ /// These are defined by PostgreSQL in <catalog/pg_type.h>, but including
  /// this file is extraordinarily convoluted, so we'll use these to fill-in.
+ /// @{
  const size_t OID_NONE = 0;   // PostgreSQL infers proper type
  const size_t OID_BOOL = 16;
  const size_t OID_BYTEA = 17;
@@@ -58,9 -62,9 +63,9 @@@ const size_t OID_INT4 = 23;  // 4 byte 
  const size_t OID_TEXT = 25;
  const size_t OID_VARCHAR = 1043;
  const size_t OID_TIMESTAMP = 1114;
 -///@}
 +/// @}
  
- /// @brief RAII wrapper for Posgtresql Result sets
+ /// @brief RAII wrapper for PostgreSQL Result sets
  ///
  /// When a Postgresql statement is executed, the results are returned
  /// in pointer allocated structure, PGresult*. Data and status information

diff --cc src/lib/dhcpsrv/subnet.h
index f4c083bf755d9b1f8b6591401eb9c3513d7531ad,3d91ae8bb9074784053d76280fd3dde677e408ed..e11187bfa30a0c3b7aef2e5256ed40e726413b2b
--- 1/src/lib/dhcpsrv/subnet.h
--- 2/src/lib/dhcpsrv/subnet.h
+++ b/src/lib/dhcpsrv/subnet.h
@@@ -306,8 -314,19 +313,18 @@@ public
      /// Also see explanation note in @ref white_list_.
      ///
      /// @param class_name client class to be supported by this subnet
 -    void
 -    allowClientClass(const isc::dhcp::ClientClass& class_name);
 +    void allowClientClass(const isc::dhcp::ClientClass& class_name);
  
+     /// @brief returns the client class white list
+     ///
+     /// @note The returned reference is only valid as long as the object
+     /// returned it is valid.
+     ///
+     /// @return client classes @ref white_list_
+     const isc::dhcp::ClientClasses& getClientClasses() const {
+         return (white_list_);
+     }
+ 
      /// @brief Specifies what type of Host Reservations are supported.
      ///
      /// Host reservations may be either in-pool (they reserve an address that

diff --cc src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.h
Simple merge

diff --cc src/lib/eval/eval_context.h
Simple merge

diff --cc src/lib/process/testutils/d_test_stubs.h
Simple merge

diff --cc src/lib/stats/stats_mgr.h
Simple merge