[master] Finished merge of trac5104 (prefix triple assignment)

diff --git a/ChangeLog b/ChangeLog
index c9b85890067cb78d4c8d67e171ab6078bd5f6b83..7af1dc33523e10fa378c378526257a7f811b4f46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1260.  [bug]           fdupont
+       Corrected logic in prefix delegation that was causing multiple
+       entries to be written to the lease file when renewing or rebinding
+       a prefix.
+       (Trac #5104, git xxx)
+
 1259.  [func]          marcin
        Implemented timeout for the control commands forwarded between
        the Control Agent and Kea servers. The enhanced forwarding