vote+promote

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

diff --git a/STATUS b/STATUS
index 2614b5d7406450ee0e2ca1bd568e1c39545d1065..cdd618b84b5b22003f92b82d81b56a0ae0ed7efc 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -88,6 +88,24 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * log_server_status: Bring Perl style forward to the present, use
+    standard modules, update for new format of server-status output.
+    Trunk patch: http://people.apache.org/~rbowen/log_server_status.trunk.patch
+      (Revisions r1325218 through r1325275)
+    2.4 patch: Trunk patch works
+    +1: rbowen, jim, sf
+
+  * core: Prevent "httpd -k restart" from killing server in presence of config error.
+    trunk patch: http://svn.apache.org/viewvc?rev=1328345&view=rev
+    2.4 patch: trunk patch works
+    +1: jorton, jim, sf
+ 
+  * mod_sed, mod_log_debug: Symbol namespace cleanups.
+    trunk patches: http://svn.apache.org/viewvc?rev=1326980&view=rev
+                   http://svn.apache.org/viewvc?rev=1326984&view=rev
+                   http://svn.apache.org/viewvc?rev=1326991&view=rev
+    2.4 patch: trunk works => http://people.apache.org/~jorton/httpd-2.4.1-symbols.patch
+    +1: jorton , jim, sf
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -105,25 +123,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4 patch: Trunk patch works
     +1: sf
 
-  * log_server_status: Bring Perl style forward to the present, use
-    standard modules, update for new format of server-status output.
-    Trunk patch: http://people.apache.org/~rbowen/log_server_status.trunk.patch
-      (Revisions r1325218 through r1325275)
-    2.4 patch: Trunk patch works
-    +1: rbowen, jim
-
-  * core: Prevent "httpd -k restart" from killing server in presence of config error.
-    trunk patch: http://svn.apache.org/viewvc?rev=1328345&view=rev
-    2.4 patch: trunk patch works
-    +1: jorton, jim
- 
-  * mod_sed, mod_log_debug: Symbol namespace cleanups.
-    trunk patches: http://svn.apache.org/viewvc?rev=1326980&view=rev
-                   http://svn.apache.org/viewvc?rev=1326984&view=rev
-                   http://svn.apache.org/viewvc?rev=1326991&view=rev
-    2.4 patch: trunk works => http://people.apache.org/~jorton/httpd-2.4.1-symbols.patch
-    +1: jorton , jim
-
   * core: Use a TLS/10 close_notify for dummy connection to SSL listener.
     trunk patches: http://svn.apache.org/viewvc?rev=1327036&view=rev
                    http://svn.apache.org/viewvc?rev=1327080&view=rev