From: Razvan Becheriu <razvan@isc.org>
Date: Thu, 23 May 2024 18:34:47 +0000 (+0300)
Subject: [#3301] addressed comments
X-Git-Tag: Kea-2.6.0~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77195c41c8a77bf055e57aa4dca36547fa252824;p=thirdparty%2Fkea.git

[#3301] addressed comments
---

diff --git a/ChangeLog b/ChangeLog
index 6015baaddb..3854c97d39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2243.	[func]		razvan
+	Updated yang modules: removed qualifying-suffix,
+	override-no-update, override-client-update,
+	replace-client-name, generated-prefix, hostname-char-set
+	and hostname-char-replacement from dhcp-ddns, removed
+	reservation-mode and added retry-on-startup,
+	stash-agent-options and ddns-conflict-resolution-mode.
+	(Gitlab #3301)
+
 2242.	[func]		razvan
 	Removed deprecated command: "libreload".
 	(Gitlab #2960)
diff --git a/doc/sphinx/arm/ext-netconf.rst b/doc/sphinx/arm/ext-netconf.rst
index b21e7bb9d8..b32f4efe7d 100644
--- a/doc/sphinx/arm/ext-netconf.rst
+++ b/doc/sphinx/arm/ext-netconf.rst
@@ -128,7 +128,7 @@ Compiling With NETCONF
 
 .. code-block:: console
 
-    $ autoreconf -f -i
+    $ autoreconf -i
     $ ./configure --with-libyang --with-libyang-cpp --with-sysrepo --with-sysrepo-cpp
 
 .. note::
diff --git a/src/lib/yang/adaptor_subnet.h b/src/lib/yang/adaptor_subnet.h
index 475fec043c..49e684f5cd 100644
--- a/src/lib/yang/adaptor_subnet.h
+++ b/src/lib/yang/adaptor_subnet.h
@@ -20,7 +20,7 @@ namespace yang {
 ///      so the caller can decide if the second pass is needed.
 ///  -2- For a subnet without an ID, assigned the next unused ID.
 ///
-/// Note as all canonization adaptor it is optional, i.e., code should work
+/// Note as all canonization adaptors it is optional, i.e., code should work
 /// without it.
 class AdaptorSubnet {
 public:
diff --git a/src/share/yang/modules/hashes/kea-dhcp4-server@2024-05-29.hash b/src/share/yang/modules/hashes/kea-dhcp4-server@2024-05-29.hash
index 1c59d21981..01d0d1f23d 100644
--- a/src/share/yang/modules/hashes/kea-dhcp4-server@2024-05-29.hash
+++ b/src/share/yang/modules/hashes/kea-dhcp4-server@2024-05-29.hash
@@ -1 +1 @@
-2340982f95cf932980e9de6b32aebf52ee8852302dcce1aaf6647db03f0f0809
+57ef5ec1a319aa17b5440f60963ae208b69e7a12943c3bb8fff830df02bdfe23
diff --git a/src/share/yang/modules/hashes/kea-dhcp6-server@2024-05-29.hash b/src/share/yang/modules/hashes/kea-dhcp6-server@2024-05-29.hash
index 83c605f12c..89edd246db 100644
--- a/src/share/yang/modules/hashes/kea-dhcp6-server@2024-05-29.hash
+++ b/src/share/yang/modules/hashes/kea-dhcp6-server@2024-05-29.hash
@@ -1 +1 @@
-953e6ab578308b714a9dbc20e5e2b3bb2b97c21194ec38911402cccb85836833
+aabb48a3bb003438297b8ce1600cfe068adc71accccaa6d711d32ed781afaaf9
diff --git a/src/share/yang/modules/kea-dhcp4-server@2024-05-29.yang b/src/share/yang/modules/kea-dhcp4-server@2024-05-29.yang
index 3d65b9f115..c1a5ba93cb 100644
--- a/src/share/yang/modules/kea-dhcp4-server@2024-05-29.yang
+++ b/src/share/yang/modules/kea-dhcp4-server@2024-05-29.yang
@@ -21,7 +21,8 @@ module kea-dhcp4-server {
                used to configure and manage a Kea DHCPv4 server.";
 
   revision 2024-05-29 {
-    description "Removed reservation-mode and added stash-agent-options.";
+    description "Removed reservation-mode and added
+                 ddns-conflict-resolution-mode and stash-agent-options.";
   }
 
   revision 2024-01-31 {
diff --git a/src/share/yang/modules/kea-dhcp6-server@2024-05-29.yang b/src/share/yang/modules/kea-dhcp6-server@2024-05-29.yang
index 20b79643ad..cee124a9ed 100644
--- a/src/share/yang/modules/kea-dhcp6-server@2024-05-29.yang
+++ b/src/share/yang/modules/kea-dhcp6-server@2024-05-29.yang
@@ -21,7 +21,8 @@ module kea-dhcp6-server {
                used to configure and manage a Kea DHCPv6 server.";
 
   revision 2024-05-29 {
-    description "Removed reservation-mode.";
+    description "Removed reservation-mode and added
+                 ddns-conflict-resolution-mode.";
   }
 
   revision 2024-01-31 {