Promote.

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

diff --git a/STATUS b/STATUS
index 03822ac8bf85282358230ac6fb7dba45d4a7cf28..4089a4479f7eb61e3d2c58ccad76182fee45e7df 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -86,6 +86,15 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * core: Support wildcards in both the directory and file components of
+    the path specified by the Include directive.
+    Trunk patch: http://svn.apache.org/viewvc?rev=909878&view=rev
+                 http://svn.apache.org/viewvc?rev=917735&view=rev
+                 http://svn.apache.org/viewvc?rev=917759&view=rev
+    2.2.x patch: http://people.apache.org/~minfrin/httpd-wildcard+docs2.patch
+    Submitted by: minfrin, poirier
+    +1: minfrin, jim, poirier
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -100,15 +109,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    sf:        Couldn't the linux 2.4 bug be worked around by calling access
               twice? Once with R_OK and once with X_OK.
 
-  * core: Support wildcards in both the directory and file components of
-    the path specified by the Include directive.
-    Trunk patch: http://svn.apache.org/viewvc?rev=909878&view=rev
-                 http://svn.apache.org/viewvc?rev=917735&view=rev
-                 http://svn.apache.org/viewvc?rev=917759&view=rev
-    2.2.x patch: http://people.apache.org/~minfrin/httpd-wildcard+docs2.patch
-    Submitted by: minfrin, poirier
-    +1: minfrin, jim, poirier
-
   * support/htcacheclean: Teach it how to write a pid file (modelled on
     httpd's writing of a pid file) so that it becomes possible to run
     more than one instance of htcacheclean on the same machine.