promote

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

diff --git a/STATUS b/STATUS
index a9111f91342d60fdefdd30e5b626c99cedbdea71..b612d76996063ed63503482a31ac95df738d9654 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -91,6 +91,27 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    * mod_dumpio: Correctly log large messages
+      PR 54179 
+      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1412278
+      2.4.x patch: http://people.apache.org/~jailletc36/backport_mod_dumpio.patch
+      +1: jailletc36, sf, druggeri
+     
+    * core: fail startup if ServerTokens arg is unrecognized, PR54222
+      trunk patch: http://svn.apache.org/viewvc?rev=1415008&view=rev
+                   http://svn.apache.org/viewvc?rev=1416150&view=rev
+      2.4.x patch: trunk works
+      +1: covener, sf, druggeri
+          Is fail startup okay? What about warn and set to PROD? 
+      sf: I think that's ok. It will be immediately obvious after upgrade and
+          is easy to fix in the configuration.
+ 
+    * core: Accept "Include /some/dir" without wildcards as documented, 
+            regression from 2.2.x.  PR54223
+      trunk patch: http://svn.apache.org/viewvc?rev=1415023&view=rev
+      2.4.x patch: 2.4.x works
+      +1: covener, jim, druggeri
+      
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -233,27 +254,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1 covener
 
-    * mod_dumpio: Correctly log large messages
-      PR 54179 
-      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1412278
-      2.4.x patch: http://people.apache.org/~jailletc36/backport_mod_dumpio.patch
-      +1: jailletc36, sf, druggeri
-     
-    * core: fail startup if ServerTokens arg is unrecognized, PR54222
-      trunk patch: http://svn.apache.org/viewvc?rev=1415008&view=rev
-                   http://svn.apache.org/viewvc?rev=1416150&view=rev
-      2.4.x patch: trunk works
-      +1: covener, sf, druggeri
-          Is fail startup okay? What about warn and set to PROD? 
-      sf: I think that's ok. It will be immediately obvious after upgrade and
-          is easy to fix in the configuration.
- 
-    * core: Accept "Include /some/dir" without wildcards as documented, 
-            regression from 2.2.x.  PR54223
-      trunk patch: http://svn.apache.org/viewvc?rev=1415023&view=rev
-      2.4.x patch: 2.4.x works
-      +1: covener, jim, druggeri
-      
     * mod_headers: Allow for exposure of loadavg and server load via mod_headers
       trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1389565
                    http://svn.apache.org/viewvc?view=revision&revision=1389566