Promote

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

diff --git a/STATUS b/STATUS
index c9389baf27fd563989f944edbbaecd8cab6dedd5..b794c289f1d9fda00ac160d5a3fd2f0ed5219953 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -80,6 +80,17 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
+    *) mod_autoindex: Add in Type and Charset options to IndexOptions
+       to allow admin to set content-type and charset of generated
+       page.
+       Trunk version of patch:
+         http://svn.apache.org/viewvc?view=rev&revision=570532
+         http://svn.apache.org/viewvc?view=rev&revision=570535
+         http://svn.apache.org/viewvc?view=rev&revision=570558
+       2.2.x version of patch:
+         Trunk version works (minus CHANGES conflicts)
+       +1: jim, wrowe, rpluem
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mpm_winnt: Fix return values from wait_for_many_objects.
@@ -190,17 +201,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       trawick says: The new directives should be documented in trunk,
           so that docs are available for backport at the same time.
 
-    *) mod_autoindex: Add in Type and Charset options to IndexOptions
-       to allow admin to set content-type and charset of generated
-       page.
-       Trunk version of patch:
-         http://svn.apache.org/viewvc?view=rev&revision=570532
-         http://svn.apache.org/viewvc?view=rev&revision=570535
-         http://svn.apache.org/viewvc?view=rev&revision=570558
-       2.2.x version of patch:
-         Trunk version works (minus CHANGES conflicts)
-       +1: jim, wrowe, rpluem
-
     *) proxy_util.c: Backport cleanups (no functional change)
        Trunk:
          http://svn.apache.org/viewvc?view=rev&revision=429875