Add CHANGES and release note for [GL #4596]

diff --git a/CHANGES b/CHANGES
index 365a7143f0e005b8471419486d6c7de630221d81..d7500fecc35b44f5040d153612ddd79ea45e82c8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6352.  [bug]           Revert change 6319 and decrease lock contention during
+                       RBTDB tree pruning by not cleaning up nodes recursively
+                       within a single prune_tree() call. [GL #4596]
+
 6351.  [protocol]      Support for the RESINFO record type has been added.
                        [GL #4413]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 2705e7bc270af1192c0993f770b999f1c9d1bdf2..2e9582ddb2782493795be52373208044bf0d78ba 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -70,6 +70,10 @@ Bug Fixes
   ISC would like to thank to Jinmei Tatuya from Infoblox for bringing
   this issue to our attention.
 
+- A regression in cache-cleaning code enabled memory use to grow
+  significantly more quickly than before, until the configured
+  :any:`max-cache-size` limit was reached. This has been fixed.
+  :gl:`#4596`
 
 Known Issues
 ~~~~~~~~~~~~