vote and promote

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

diff --git a/STATUS b/STATUS
index 1335636b85684de94dade454cd23ea635ffa983a..be8641fd3703600f0dd4c491571f0ec3f710b1e2 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -162,6 +162,21 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
        svn merge -c 1861542,r1861569 ^/httpd/httpd/trunk .
      +1: minfrin, covener, icing
 
+  *) mod_status: Remove duplicate keys "BusyWorkers" and "IdleWorkers".
+     Resolve inconsistency between the previous two occurrences by
+     counting workers in state SERVER_GRACEFUL no longer as busy,
+     but instead in a new counter "GracefulWorkers" (or on HTML
+     view as "workers gracefully restarting"). Also add the graceful
+     counter as a new column to the existing HTML per process table
+     for async MPMs.
+     PR 63300
+     Trunk version of patch:
+        https://svn.apache.org/r1909429
+        https://svn.apache.org/r1909606
+     Backport version for 2.4.x of patch:
+        svn merge -c r1909429,r1909606 ^/httpd/httpd/trunk .
+     +1: rjung, jorton, icing
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -222,21 +237,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: minfrin
      covener: diff doesn't seem to apply clean to 2.4.x (with or without 1861542,r1861569 above)
 
-  *) mod_status: Remove duplicate keys "BusyWorkers" and "IdleWorkers".
-     Resolve inconsistency between the previous two occurrences by
-     counting workers in state SERVER_GRACEFUL no longer as busy,
-     but instead in a new counter "GracefulWorkers" (or on HTML
-     view as "workers gracefully restarting"). Also add the graceful
-     counter as a new column to the existing HTML per process table
-     for async MPMs.
-     PR 63300
-     Trunk version of patch:
-        https://svn.apache.org/r1909429
-        https://svn.apache.org/r1909606
-     Backport version for 2.4.x of patch:
-        svn merge -c r1909429,r1909606 ^/httpd/httpd/trunk .
-     +1: rjung, jorton
-
   *) mod_dav: add DavBasePath (PR 35077)
      Trunk version of patch:
         https://svn.apache.org/r1911651