vote, promote

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

diff --git a/STATUS b/STATUS
index 4ece69b3a5bb5a39111eaa0b47ff33f1bea764cc..c1806262db7e798a89bbd6b55d67298b82014f8f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -80,7 +80,7 @@ RELEASE SHOWSTOPPERS:
         http://svn.apache.org/viewvc?view=rev&revision=443503
       2.2.x version of patch:
         Trunk version works
-      +1: jim, rpluem
+      +1: jim, rpluem, trawick
     
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
@@ -124,6 +124,29 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       Trunk: http://svn.apache.org/viewvc?view=rev&revision=450063
       +1: minfrin, rpluem, jim
 
+    * mod_mime_magic: Fix precedence problem.
+        PR: 40656
+      Trunk version of patch:
+        http://svn.apache.org/viewvc?view=rev&rev=452212
+      2.2.x version of patch:
+        Trunk version works
+      +1: rpluem, niq, trawick
+
+    * mod_echo: Fix precedence problem.
+        PR: 40658
+      Trunk version of patch:
+        http://svn.apache.org/viewvc?view=rev&rev=452213
+      2.2.x version of patch:
+        Trunk version works
+      +1: rpluem, niq, trawick
+
+    * mod_disk_cache: Make sure that only positive integers are accepted
+      for the CacheMaxFileSize and CacheMinFileSize parameters in the
+      config file. PR39380
+      Trunk: http://svn.apache.org/viewvc?view=rev&revision=450042
+      2.2.x: http://people.apache.org/~minfrin/mod_disk_cache-lfsconfig-2.2.patch
+      +1: minfrin, jim, trawick
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mpm_winnt: Fix return values from wait_for_many_objects.
@@ -229,13 +252,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml?r1=420990&r2=421725 (docs)
       +1: niq
 
-    * mod_disk_cache: Make sure that only positive integers are accepted
-      for the CacheMaxFileSize and CacheMinFileSize parameters in the
-      config file. PR39380
-      Trunk: http://svn.apache.org/viewvc?view=rev&revision=450042
-      2.2.x: http://people.apache.org/~minfrin/mod_disk_cache-lfsconfig-2.2.patch
-      +1: minfrin, jim
-
     * mod_mem_cache: Memory leak fix: Unconditionally free the buffer.
       Trunk: http://svn.apache.org/viewvc?view=rev&revision=450070
       +1: minfrin, jim
@@ -246,19 +262,3 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       Trunk: http://svn.apache.org/viewvc?view=rev&revision=450089
       +1: minfrin
 
-    * mod_mime_magic: Fix precedence problem.
-        PR: 40656
-      Trunk version of patch:
-        http://svn.apache.org/viewvc?view=rev&rev=452212
-      2.2.x version of patch:
-        Trunk version works
-      +1: rpluem, niq
-
-    * mod_echo: Fix precedence problem.
-        PR: 40658
-      Trunk version of patch:
-        http://svn.apache.org/viewvc?view=rev&rev=452213
-      2.2.x version of patch:
-        Trunk version works
-      +1: rpluem, niq
-