Vote + promote

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

diff --git a/STATUS b/STATUS
index b2af22fcb58ff4e4d68d2e91020efb0cf81b0e08..81157d88b8ae91a22c0cc00e340271d961c9b3f3 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,6 +90,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    * mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
+      correctly.
+      trunk patch: http://svn.apache.org/r1492663
+      2.4.x patch: trunk patch works modulo CHANGES
+      +1: minfrin, covener, jailletc36
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -151,12 +156,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk patch works modulo CHANGES
       +1: minfrin, jim
 
-    * mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
-      correctly.
-      trunk patch: http://svn.apache.org/r1492663
-      2.4.x patch: trunk patch works modulo CHANGES
-      +1: minfrin, covener
-
     * mod_proxy: protect pool usage w/ mutex.
       trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1480627
                    https://svn.apache.org/viewvc?view=revision&revision=1482859