vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1809278 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 9b57e094e52cb210e3e9c6c9a006eb40ca0749c5..a904fcad04e480a28a7cc267e1dee0566d44daa2 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -115,6 +115,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) event: Avoid possible blocking in the listener thread when shutting down
+     connections. PR 60956.
+     trunk patch: http://svn.apache.org/r1802875
+     2.4.x patch: trunks works (module CHANGES)
+                  svn merge -c 1802875 ^/httpd/httpd/trunk .
+     +1: ylavic, jim, icing
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -179,14 +186,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 mod_journald can't be configured in maintainer mode (-std=c89).
                 Can anyone else reproduce, or is it just my distro?
 
-  *) event: Avoid possible blocking in the listener thread when shutting down
-     connections. PR 60956.
-     trunk patch: http://svn.apache.org/r1802875
-     2.4.x patch: trunks works (module CHANGES)
-                  svn merge -c 1802875 ^/httpd/httpd/trunk .
-     +1: ylavic, jim
-
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]