From 24616ba7292fe15128db42254ee345eba81b422b Mon Sep 17 00:00:00 2001 From: Morten Brekkevold Date: Mon, 3 Jun 2024 09:54:53 +0200 Subject: [PATCH] Update changelog for 5.10.2 release --- CHANGELOG.md | 14 ++++++++++++++ changelog.d/2910.fixed.md | 1 - changelog.d/2926.changed.md | 1 - 3 files changed, 14 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/2910.fixed.md delete mode 100644 changelog.d/2926.changed.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 88c35ed8b9..b50d1ea44e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,20 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang +## [5.10.2] - 2024-06-03 + + +### Changed + +- `snmptrapd` renamed to `navtrapd` to avoid naming conflicts with Net-SNMP + programs ([#2926](https://github.com/Uninett/nav/issues/2926)) + +### Fixed + +- Replace incorrect fix for premature ARP record closure introduced in 5.10.1 + ([#2910](https://github.com/Uninett/nav/issues/2910)) + + ## [5.10.1] - 2024-05-27 diff --git a/changelog.d/2910.fixed.md b/changelog.d/2910.fixed.md deleted file mode 100644 index c6ecb7fcf9..0000000000 --- a/changelog.d/2910.fixed.md +++ /dev/null @@ -1 +0,0 @@ -Replace incorrect fix for premature ARP record closure introduced in 5.10.1 \ No newline at end of file diff --git a/changelog.d/2926.changed.md b/changelog.d/2926.changed.md deleted file mode 100644 index e0370f295c..0000000000 --- a/changelog.d/2926.changed.md +++ /dev/null @@ -1 +0,0 @@ -`snmptrapd` renamed to `navtrapd` to avoid naming conflicts with Net-SNMP programs \ No newline at end of file