diff options
| author | Tomek Mrugalski <tomek@isc.org> | 2024-04-26 11:45:07 +0200 |
|---|---|---|
| committer | Marcin Siodelski <marcin@isc.org> | 2024-04-26 13:39:03 +0200 |
| commit | 8cd15d3c86fe873211503bee488ac026c103ec3b (patch) | |
| tree | d18e4ea3e58272340a92e0be62f0e400766a9ec9 | |
| parent | [#3344] Fix origin type in notify cmd (diff) | |
| download | kea-8cd15d3c86fe873211503bee488ac026c103ec3b.tar.xz kea-8cd15d3c86fe873211503bee488ac026c103ec3b.zip | |
[#3344] Correct Kea versions in comments
| -rw-r--r-- | doc/sphinx/arm/ctrl-channel.rst | 2 | ||||
| -rw-r--r-- | src/bin/dhcp4/ctrl_dhcp4_srv.cc | 8 | ||||
| -rw-r--r-- | src/bin/dhcp6/ctrl_dhcp6_srv.cc | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/doc/sphinx/arm/ctrl-channel.rst b/doc/sphinx/arm/ctrl-channel.rst index d4d92e363b..c2eb46607b 100644 --- a/doc/sphinx/arm/ctrl-channel.rst +++ b/doc/sphinx/arm/ctrl-channel.rst @@ -721,7 +721,7 @@ communication between HA partners and should not be specified in the administrator's commands, as it may interfere with HA operation. The administrator should either omit this parameter or set it to "user". -Introduction of ``origin-id`` deprecates the use of the ``origin`` parameter +Introduction of ``origin-id`` in Kea 2.5.8 deprecates the use of the ``origin`` parameter in the messages exchanged between the Kea HA partners. The ``origin-id`` parameter must not be used in messages sent by the user. diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc index ef4b7de88b..e18ef22265 100644 --- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc +++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc @@ -559,9 +559,9 @@ ControlledDhcpv4Srv::commandDhcpDisableHandler(const std::string&, } } } - // 'origin-id' replaces the older parameter 'origin' since Kea 2.6.0 + // 'origin-id' replaces the older parameter 'origin' since Kea 2.5.8 // stable release. However, the 'origin' is kept for backward compatibility - // with Kea versions before 2.6.0. It is common to receive both parameters + // with Kea versions before 2.5.8. It is common to receive both parameters // because HA hook library sends both in case the partner server hasn't been // upgraded to the new version. The 'origin-id' takes precedence over the // 'origin'. @@ -638,9 +638,9 @@ ControlledDhcpv4Srv::commandDhcpEnableHandler(const std::string&, message << "arguments for the 'dhcp-enable' command must be a map"; } else { - // 'origin-id' replaces the older parameter 'origin' since Kea 2.6.0 + // 'origin-id' replaces the older parameter 'origin' since Kea 2.5.8 // stable release. However, the 'origin' is kept for backward compatibility - // with Kea versions before 2.6.0. It is common to receive both parameters + // with Kea versions before 2.5.8. It is common to receive both parameters // because HA hook library sends both in case the partner server hasn't been // upgraded to the new version. The 'origin-id' takes precedence over the // 'origin'. diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc index f9d89a1cee..95e6de51da 100644 --- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc +++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc @@ -561,9 +561,9 @@ ControlledDhcpv6Srv::commandDhcpDisableHandler(const std::string&, } } } - // 'origin-id' replaces the older parameter 'origin' since Kea 2.6.0 + // 'origin-id' replaces the older parameter 'origin' since Kea 2.5.8 // stable release. However, the 'origin' is kept for backward compatibility - // with Kea versions before 2.6.0. It is common to receive both parameters + // with Kea versions before 2.5.8. It is common to receive both parameters // because HA hook library sends both in case the partner server hasn't been // upgraded to the new version. The 'origin-id' takes precedence over the // 'origin'. @@ -640,9 +640,9 @@ ControlledDhcpv6Srv::commandDhcpEnableHandler(const std::string&, message << "arguments for the 'dhcp-enable' command must be a map"; } else { - // 'origin-id' replaces the older parameter 'origin' since Kea 2.6.0 + // 'origin-id' replaces the older parameter 'origin' since Kea 2.5.8 // stable release. However, the 'origin' is kept for backward compatibility - // with Kea versions before 2.6.0. It is common to receive both parameters + // with Kea versions before 2.5.8. It is common to receive both parameters // because HA hook library sends both in case the partner server hasn't been // upgraded to the new version. The 'origin-id' takes precedence over the // 'origin'. |