promote

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

diff --git a/STATUS b/STATUS
index a2420d875a9b98102ce3b2d7997cef115a4b1f36..e7bfe1e9928a21780bb14a59e8ef3c28ed02b286 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -116,6 +116,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk patches apply (minus CHANGES for 1448171)
     2.4.x cumulative patch: http://people.apache.org/~jailletc36/backport5.patch (minus CHANGES for 1448171)
     +1: jailletc36, igalic, jim
+
+  * mod_cache_disk: fix merge of min/max file size by setting corresponding _set
+    trunk patch: http://svn.apache.org/r1453604
+    2.4.x patch: trunk patch works
+    +1: humbedooh, jim, covener
+    
     
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -161,11 +167,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk patch applies.
     +1: wrowe, covener
 
-  * mod_cache_disk: fix merge of min/max file size by setting corresponding _set
-    trunk patch: http://svn.apache.org/r1453604
-    2.4.x patch: trunk patch works
-    +1: humbedooh, jim
-    
   * mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to) 
              Server pools, new apr functions for the request_rec table, input/
              output filters, LuaCodeCache, LuaMapHandler and multipart form data