[#3576] Updated ARM, added ChangeLog

modified:
    ChangeLog
    doc/sphinx/arm/classify.rst

diff --git a/ChangeLog b/ChangeLog
index 0807ac1bcdbb215a8c7fc4e9b4ba382c3abe6506..34bdd637e03f365c52ac92a9a9abeed20766ad7c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2283.   [func]      tmark
+       The order or precedence of options specified in a
+       template class and its spawned classes has been
+       reversed.  An option specified in a spawned class now
+       takes precedence over the same option if specified in
+       the template class. This change applies to both
+       kea-dhcp4 and kea-dhcp6.
+       (Gitlab #3576)
+
 2282.  [bug]           razvan
        Fixed a bug caused by starting listeners when checking the
        configuration using the '-T' command line parameter. This was

diff --git a/doc/sphinx/arm/classify.rst b/doc/sphinx/arm/classify.rst
index 33700ea305e47c3d5a3faa8d0a51e3649547f3eb..bf1f8160153c59497f76427e66a920a7bc936f7c 100644 (file)
--- a/doc/sphinx/arm/classify.rst
+++ b/doc/sphinx/arm/classify.rst
@@ -730,7 +730,8 @@ A client class definition can contain the following properties:
    The resulting spawned class has the following generated name format:
    ``SPAWN_<template-class-name>_<evaluated-value>``.
    After classes are evaluated and a spawned class is generated, the corresponding
-   template class name is also associated with the packet.
+   template class name is also associated with the packet. An Option specified in a
+   spawned class will take precedence over the same option if set in its template class.
  - The ``option-data`` list is not mandatory and contains options that should be
    assigned to members of this class. In the case of a template class, these
    options are assigned to the generated spawned class.