[github99] Temporarily removing entries to avoid merge errors.

diff --git a/ChangeLog b/ChangeLog
index 862974552bd25739fd4f642a6e105a83a8db1e78..b54e5bcdefcbad91f247c7d854855c78a933166c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,48 +1,3 @@
-1441.  [func]          marcin
-       Added log message indicating that the control socket has been
-       opened by a server.
-       (gitlab #8, git 3dbaf4917bea112466f1ee5726870c545950e114)
-
-1440.  [func]          tmark
-       The internal represenation of an "unused" subnet-id has been
-       changed from zero to 0xFFFFFFFF. The largest, valid value for
-       a subnet's ID is now 0xFFFFFFFE.  Three new constants have been
-       added so subnet_id.h:
-
-               isc::dhcp::SUBNET_ID_GLOBAL
-               isc::dhcp::SUBNET_ID_UNUSED
-               isc::dhcp::SUBNET_ID_MAX
-
-       which should be used in code/hooks in place of hard-coded values.
-       (Trac #5704, git 90fe9ca2cd6f63bcc7168bdc3786677db57b65ec)
-
-1439.  [func]          tomek
-       keactrl and kea-admin tools can now report version.
-       (gitlab #9, git 4a00ab5d4b9ac9193fc5f924149aeaca7a88e2ef)
-
-1438.  [func]          tomek
-       subnet-id parameter is now optional in lease4-add, lease6-add,
-       lease4-update and lease6-update commands. If not specified or
-       its value is zero, Kea will attempt to figure out the correct
-       value of subnet-id. If there is no matching subnet configured,
-       the lease will be rejected.
-       (Trac #5683, git a8ce7a78b5b294e6bce02de887552a1e4593db4e)
-
-1437.  [func]          tomek
-       DHCPv4 and DHCPv6 servers are now able to sanity check and
-       possibly correct some inconsistencies in leases when loaded from
-       disk (memfile). A new parameter to govern this behavior has been
-       added.
-       (Trac #5682, git 609bfa0a67caa91fac6834eb39260acfd19e3be4)
-
-1436.   [func]      tmark
-       Added two new configuration paramters to kea-dhcp4 and kea-dhcp6
-       DhcpDdns sections: 'hostname-char-set' and 'hostname-char-replacment'.
-       These values (when not empty) are used by the server to sanitize
-       host name and FQDN domain names sent by clients prior to using them
-       to construct DNS names.
-       (Trac #5680, git 32466ab3d4688e66c8c2f9fd24d4a98fcc871ff6)
-
 1435.  [func]          marcin
        Implemented ha-continue command in HA hooks library and
        updated the Kea User's Guide with the information how to

diff --git a/src/lib/dhcpsrv/host.h b/src/lib/dhcpsrv/host.h
index 06a72795fda6f51d82576b224618b11f48acdc61..ef2ba18042d26b1e683f4e4563365c84eae0ae76 100644 (file)
--- a/src/lib/dhcpsrv/host.h
+++ b/src/lib/dhcpsrv/host.h
@@ -709,6 +709,7 @@ private:
     /// we queried other backends for specific host and there was no
     /// entry for it.
     bool negative_;
+
     /// @brief key for authentication .
     ///
     /// key is a 16 byte value to be used in the authentication field.