[#3140] Post #4157 merge fixes

diff --git a/changelog_unreleased/3140-add-statistics-counters-for-dropped-packets b/changelog_unreleased/3140-add-statistics-counters-for-dropped-packets
index 91d77008a1b84bd63889e737cc650fc447f5a417..4dcec5767868d0020bbe006a73bdc3eb2dccc6ee 100644 (file)
--- a/changelog_unreleased/3140-add-statistics-counters-for-dropped-packets
+++ b/changelog_unreleased/3140-add-statistics-counters-for-dropped-packets
@@ -1,3 +1,5 @@
 [func]         fdupont
-       [description]
-       (Gitlab #3140)
+       Added "pkt4-queue-full" and "pkt6-queue-full"
+       statistics which are increased when an incoming packet
+       was dropped because it was queued and the queue is full.
+       (Gitlab #3140, #4157)

diff --git a/changelog_unreleased/4157-add-drop-stats-queue-full b/changelog_unreleased/4157-add-drop-stats-queue-full
deleted file mode 100644 (file)
index b371dce..0000000
--- a/changelog_unreleased/4157-add-drop-stats-queue-full
+++ /dev/null
@@ -1,5 +0,0 @@
-[func]         fdupont
-       Added "pkt4-queue-full" and "pkt6-queue-full"
-       statistics which are increased when an incoming packet
-       was dropped because it was queued and the queue is full.
-       (Gitlab #4157)

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 8fe7680cd1cff08dc481cce18d74a4cf4d261d91..d0646785dce5212233777e6ed28610b3b0de9f84 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -7812,7 +7812,7 @@ a second counter detailing the drop cause:
 
 - ``pkt4-parse-failed`` - packet parsing raised a fatal error
 
-- ``pkt6-queue-full`` - parked packet in a queue which became full
+- ``pkt4-queue-full`` - parked packet in a queue which became full
 
 .. note::