From: Francis Dupont Date: Mon, 29 Jun 2020 14:12:36 +0000 (+0200) Subject: [#916] Updated for 1.7.10 X-Git-Tag: Kea-1.7.10~74 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0c79c457acbde7179e99823a5e44580bef2fc0f;p=thirdparty%2Fkea.git [#916] Updated for 1.7.10 --- diff --git a/doc/devel/config-backend.dox b/doc/devel/config-backend.dox index fb46c9525c..ced3aff88d 100644 --- a/doc/devel/config-backend.dox +++ b/doc/devel/config-backend.dox @@ -117,5 +117,5 @@ The following are some details of the JSON backend framework. that sending signals is possible (for configuration reload or shutdown). It is also able to print out a status.

-# The capability to share the same configuration file between servers and - agents, and the Logging toplevel entry, were removed in 1.7.9. + agents, and the Logging toplevel entry, were removed in 1.7.10. */ diff --git a/doc/sphinx/arm/config.rst b/doc/sphinx/arm/config.rst index 5e6ba85abb..1c76a9e04c 100644 --- a/doc/sphinx/arm/config.rst +++ b/doc/sphinx/arm/config.rst @@ -91,11 +91,11 @@ directory. "loggers" object) moved inside the configuration objects (maps) for the respective Kea modules. For example: the "Dhcp4" map contains the "loggers" object specifying logging configuration for the DHCPv4 - server. Backward compatibility is maintained until Kea 1.7.9 + server. Backward compatibility is maintained until Kea 1.7.10 release; it will be possible to specify the "Logging" object at the top configuration level and "loggers" objects at the module configuration level. Finally, support for the top-level "Logging" object was - removed in Kea 1.7.9. + removed in Kea 1.7.10. The specification of several supported elements (e.g. "Dhcp4", "Dhcp6") in a single configuration file can be confusing and works diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst index f97d22d4ac..4fb6bc8127 100644 --- a/doc/sphinx/arm/dhcp4-srv.rst +++ b/doc/sphinx/arm/dhcp4-srv.rst @@ -148,7 +148,7 @@ above this object is called ``Dhcp4``. In the current Kea release it is possible to specify configurations of multiple modules within a single configuration file, but this is - not recommended and support for it was removed in 1.7.9 release, + not recommended and support for it was removed in 1.7.10 release, including the ``Logging`` object: its previous content, the list of loggers, must now be inside the ``Dhcp4`` object. diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst index 1f66e8c641..bcfbed8db2 100644 --- a/doc/sphinx/arm/dhcp6-srv.rst +++ b/doc/sphinx/arm/dhcp6-srv.rst @@ -149,7 +149,7 @@ above this object is called ``Dhcp6``. In the current Kea release it is possible to specify configurations of multiple modules within a single configuration file, but this is - not recommended and support for it was removed in 1.7.9 release, + not recommended and support for it was removed in 1.7.10 release, including the ``Logging`` object: its previous content, the list of loggers, must now be inside the ``Dhcp6`` object. diff --git a/doc/sphinx/arm/logging.rst b/doc/sphinx/arm/logging.rst index 7059323909..ca0ccb00cb 100644 --- a/doc/sphinx/arm/logging.rst +++ b/doc/sphinx/arm/logging.rst @@ -18,7 +18,7 @@ useful when debugging a problem. The logging system in Kea is configured through the loggers entry in the server section of your configuration file. In previous Kea releases this entry was in an independent Logging section; this was still supported -for backward compatibility until Kea 1.7.8 included. +for backward compatibility until Kea 1.7.9 included. Loggers ------- diff --git a/src/lib/process/process_messages.cc b/src/lib/process/process_messages.cc index 11622eaad7..a659299da8 100644 --- a/src/lib/process/process_messages.cc +++ b/src/lib/process/process_messages.cc @@ -1,4 +1,4 @@ -// File created from ../../../src/lib/process/process_messages.mes on Mon Jun 22 2020 17:22 +// File created from ../../../src/lib/process/process_messages.mes on Mon Jun 29 2020 16:06 #include #include diff --git a/src/lib/process/process_messages.h b/src/lib/process/process_messages.h index 61f61e156d..807f9c65d8 100644 --- a/src/lib/process/process_messages.h +++ b/src/lib/process/process_messages.h @@ -1,4 +1,4 @@ -// File created from ../../../src/lib/process/process_messages.mes on Mon Jun 22 2020 17:22 +// File created from ../../../src/lib/process/process_messages.mes on Mon Jun 29 2020 16:06 #ifndef PROCESS_MESSAGES_H #define PROCESS_MESSAGES_H