* Promote

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

diff --git a/STATUS b/STATUS
index 14f69a0da82125737769cef24d826e00f7afdd20..9d5353ae51a572b35d22a780d4078932362e96e6 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -87,7 +87,20 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-
+   * mod_authnz_ldap: Add AuthLDAPBindAuthoritative to allow other authentication 
+     providers a chance to run when mod_authnz_ldap finds a user but can't 
+     verify their password. PR46608.
+     Trunk patch: http://svn.apache.org/viewvc?rev=881808&view=rev
+             doc: http://svn.apache.org/viewvc?view=revision&revision=881812
+     2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-ldap_bind_authoritative.diff 
+     2.2.x doc  : http://people.apache.org/~covener/patches/2.2.x-ldap_bind_authoritative-doc.diff
+                  (resolves loglevel conflict introduced after the trunk commit)
+    +1: covener, pgollucci
+    rpluem says: I am +1 once you provide proper documentation for the manual
+    covener says: doc revision added above
+    minfrin says: The trunk patches no longer apply clean, is it possible to
+                  create a v2.2. patch?
+    covener: resolved conflict 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -115,21 +128,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    2.2.x Patch: http://people.apache.org/~minfrin/httpd-cache-thundering.patch
    +1: minfrin, jim
 
-   * mod_authnz_ldap: Add AuthLDAPBindAuthoritative to allow other authentication 
-     providers a chance to run when mod_authnz_ldap finds a user but can't 
-     verify their password. PR46608.
-     Trunk patch: http://svn.apache.org/viewvc?rev=881808&view=rev
-             doc: http://svn.apache.org/viewvc?view=revision&revision=881812
-     2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-ldap_bind_authoritative.diff 
-     2.2.x doc  : http://people.apache.org/~covener/patches/2.2.x-ldap_bind_authoritative-doc.diff
-                  (resolves loglevel conflict introduced after the trunk commit)
-    +1: covener, pgollucci
-    rpluem says: I am +1 once you provide proper documentation for the manual
-    covener says: doc revision added above
-    minfrin says: The trunk patches no longer apply clean, is it possible to
-                  create a v2.2. patch?
-    covener: resolved conflict 
-
   * mod_reqtimeout: New module to limit time waiting for requests from clients.
     Backport current version from trunk.
     Trunk Patch: http://svn.apache.org/viewvc?rev=821591&view=rev