Promote.

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

diff --git a/STATUS b/STATUS
index 92124ea87335a23f349915c6632422d111fcc704..d162a736ec7b59044528be7d1e0073ec975b420c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -119,10 +119,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
   *) mpm_queue: Put fdqueue code in common for MPMs event and worker.
      trunk patch: http://svn.apache.org/r1821624
                   http://svn.apache.org/r1821625
@@ -168,6 +164,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                    the mpm_queue branch can also be synchronized after this
                    merge, YMMV :)
      +1: ylavic, minfrin (with mmn bump for CONN_STATE_NUM), jim
+     ylavic:    + http://svn.apache.org/r1824862 (MMN bump)
+
+  *) mod_ldap: apr_rmm loops/hangs/crashes when LDAP auth is used in vhosts
+               due to unlocked access. 
+     trunk patch: http://svn.apache.org/r1824811
+     2.4.x: trunk works
+     +1 covener, rpluem, jim
+
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
 
   *) mod_dav: Allow other modules to become providers and add ACLs
      to the DAV response.
@@ -177,12 +184,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x: trunk works modulo CHANGES/MMN/log-message
      +1: minfrin, jim
 
-  *) mod_ldap: apr_rmm loops/hangs/crashes when LDAP auth is used in vhosts
-               due to unlocked access. 
-     trunk patch: http://svn.apache.org/r1824811
-     2.4.x: trunk works
-     +1 covener, rpluem, jim
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]