* Synic with 2.2.x branch (r306884)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@306888 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 0c770be16aca3ebcf2cb7db3af3e4619602a3e10..cc1932ce57500e680524e110784746fc242f1399 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) mod_proxy_balancer: mod_proxy_balancer does not handle sticky sessions
-     with tomcat correctly. PR36507. [Ruediger Pluem]
-
   *) mod_proxy: Run the request_status hook also if there are no free workers
      or all workers are in error state.
      [Ruediger Pluem, Brian Akins <brian.akins turner.com>]
@@ -31,6 +28,9 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.9
 
+  *) mod_proxy_balancer: mod_proxy_balancer does not handle sticky sessions
+     with tomcat correctly. PR36507. [Ruediger Pluem]
+
   *) mod_proxy_connect: Fix high CPU loop on systems like UnixWare which
      trigger POLL_ERR or POLL_HUP on a terminated connection.  PR 36951.
      [Jeff Trawick, Ruediger Pluem]