From: Rainer Jung <rjung@apache.org>
Date: Tue, 12 Feb 2013 12:01:29 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.2.24~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72955273e9a3a693f5a1cb3c0ed29fa8a303a7d5;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote.


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

diff --git a/STATUS b/STATUS
index 0787fe83f79..ac811503be9 100644
--- a/STATUS
+++ b/STATUS
@@ -94,6 +94,20 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_dir: Support for the 'disabled' FallbackResource argument
+     trunk patch : https://svn.apache.org/viewvc?view=revision&revision=1398066
+     Also suggested for backport to 2.4
+     2.2.x src patch: trunk patch works
+     2.2.x documentation patch : http://apache-doc-fr.gryzor.com/fallbackresource_disabled_2.2_doc.patch
+     +1: gryzor, wrowe, rjung
+
+   * mod_ldap: restore LDAP_UNAVAILABLE for windows SDK (PR 54140)
+     trunk patch: http://svn.apache.org/viewvc?rev=1408402&view=rev
+     2.4.x patch: http://svn.apache.org/viewvc?rev=1409773&view=rev
+     2.2.x patch: http://people.apache.org/~covener/patches/httpd-2.2.x-ldap_unavailable.diff 
+                 (just context conflicts)
+     +1: covener, wrowe, rjung
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -177,13 +191,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              by the patch author)
      rjung: agreed, we first need to backport r1175416.
 
-   * mod_dir: Support for the 'disabled' FallbackResource argument
-     trunk patch : https://svn.apache.org/viewvc?view=revision&revision=1398066
-     Also suggested for backport to 2.4
-     2.2.x src patch: trunk patch works
-     2.2.x documentation patch : http://apache-doc-fr.gryzor.com/fallbackresource_disabled_2.2_doc.patch
-     +1: gryzor, wrowe
-
    * modules/ldap/util_ldap.c: Correct erroneous messages
      PR: 53402
      trunk and 2.4.x: Erroneous message about LDAPSharedCacheSize
@@ -200,13 +207,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      rjung: I don't understand what was voted on, the backport of both revisions
             or only the PR attachment. The latter is only about r627637.
 
-   * mod_ldap: restore LDAP_UNAVAILABLE for windows SDK (PR 54140)
-     trunk patch: http://svn.apache.org/viewvc?rev=1408402&view=rev
-     2.4.x patch: http://svn.apache.org/viewvc?rev=1409773&view=rev
-     2.2.x patch: http://people.apache.org/~covener/patches/httpd-2.2.x-ldap_unavailable.diff 
-                 (just context conflicts)
-     +1: covener, wrowe
-
    * mod_ssl: PR 52162: log revoked certificates at level INFO instead of DEBUG
      trunk/2.4.x: Changed as part of http://svn.apache.org/viewvc?rev=1165056&view=rev
      2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=27913