From 2b10596ca122a14416dd516fa48198d86c00e85b Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Fri, 14 Aug 2020 21:20:36 +0300 Subject: [PATCH] [#1335] addressed review and added ChangeLog --- ChangeLog | 5 +++++ src/bin/dhcp4/dhcp4_messages.mes | 4 ++-- src/bin/dhcp6/dhcp6_messages.mes | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a24d08a803..5cd75ddd5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1789. [bug] razvan + Fixed a bug in the lease reclaim process which would not reschedule the + timer if the operation failed. + (Gitlab #1335) + 1788. [bug]* fdupont When a host reservation in a subnet reserves an address, the address must be within the subnet. This check was previously diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes index cfb510fa5c..0e0d4f755e 100644 --- a/src/bin/dhcp4/dhcp4_messages.mes +++ b/src/bin/dhcp4/dhcp4_messages.mes @@ -434,8 +434,8 @@ the client's IPv4 address to which the response will be sent. The third argument contains the local interface name. % DHCP4_RECLAIM_EXPIRED_LEASES_FAIL failed to reclaim expired leases: %1 -This error message indicates that the reclaim expired leases operation failed, -also providing the cause of failure. +This error message indicates that the reclaim expired leases operation failed +and provides the cause of failure. % DHCP4_INIT_FAIL failed to initialize Kea server: %1 The server has failed to initialize. This may be because the configuration diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes index 14250768c4..419cb1bae5 100644 --- a/src/bin/dhcp6/dhcp6_messages.mes +++ b/src/bin/dhcp6/dhcp6_messages.mes @@ -437,8 +437,8 @@ will be assigned. The argument holds the client and transaction identification information. % DHCP6_RECLAIM_EXPIRED_LEASES_FAIL failed to reclaim expired leases: %1 -This error message indicates that the reclaim expired leases operation failed, -also providing the cause of failure. +This error message indicates that the reclaim expired leases operation failed +and provides the cause of failure. % DHCP6_INIT_FAIL failed to initialize Kea server: %1 The server has failed to establish communication with the rest of Kea, -- 2.47.2