Add CHANGES and release note for [GL #3249]

(cherry picked from commit 855f49cfbad3404d695d501ed806df7d3565161f)

diff --git a/CHANGES b/CHANGES
index c30a7712dc3cab1d4d2415417dfca29416b4d1d4..b065614158b0cc461b3ae99d67eb9322f03b0daf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5852.  [func]          Add new "load-balance-socket" option to
+                       enable/disable load balancing of sockets. [GL #3249]
+
 5850.  [func]          Run the RPZ update process on the offload threads.
                        [GL #3190]
 

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index eee314e88af895c2ae4dd969794ef726838da7e1..a03f9a6fbedad295f323ade15e089b9292114c12 100644 (file)
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -42,6 +42,12 @@ Feature Changes
 
 - None.
 
+- Add a new configuration option ``load-balance-sockets`` to disable
+  load balancing on sockets in scenarios in which processing of
+  Response Policy Zones (RPZ), Catalog Zones, or large zone transfers
+  can cause service disruptions. See the BIND 9 ARM for more detail.
+  :gl:`#3249`
+
 Bug Fixes
 ~~~~~~~~~