summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorFrancis Dupont <fdupont@isc.org>2023-02-11 01:36:00 +0100
committerFrancis Dupont <fdupont@isc.org>2023-03-06 15:06:01 +0100
commit6435ce1b1c8f25701e806cb34523915cea5476be (patch)
tree0c6416315fad1b79facf333ae886a63341efc7ab /ChangeLog
parent[#467] Updated doc (diff)
downloadkea-6435ce1b1c8f25701e806cb34523915cea5476be.tar.xz
kea-6435ce1b1c8f25701e806cb34523915cea5476be.zip
[#467] Added a ChangeLog entry
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog10
1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a6776594c9..0f481f94af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2107. [func] fdupont
+ The Kea DHCPv4 server can now handle multiple vivco-suboptions
+ options with different enterprise IDs.
+ (Gitlab #467)
+
2106. [bug] tmark
Corrected code that allowed lease6-get-* commands to return
IA_NA leases with prefix length values of zero and logic in
@@ -68,8 +73,13 @@ Kea 2.3.5 (development) released on February 22, 2023
configuration error.
(Gitlab #2677)
+<<<<<<< HEAD
2096. [bug] [tmark]
Fixed a bug which allowed options to be added to themselves
+=======
+2096. [bug] tmark
+ Corrected a bug which allowed options to be added to themselves
+>>>>>>> c35373e401 ([#467] Added a ChangeLog entry)
as suboptions.
(Gitlab #2538)