From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 28 Aug 2018 20:11:39 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.4.35~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6748df0051575e8be9c8c7ffcf8c7d952b2bcd6d;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote.

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

diff --git a/STATUS b/STATUS
index 8db2fd08f9a..9a3cf729f92 100644
--- a/STATUS
+++ b/STATUS
@@ -147,6 +147,40 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       2.4.x patch: http://people.apache.org/~covener/2.4.x-proxy-opt-fn.diff
       +1: covener, jim, ylavic
 
+   *) mod_proxy: Improve the balancer member data shown
+      in mod_status when "ProxyStatus" is "On":
+      add "busy" count and show byte counts in auto
+      mode always in units of kilobytes.
+      trunk: http://svn.apache.org/r1837588
+      2.4.x patch: svn merge -c 1837588 ^/httpd/httpd/trunk . 
+                   (adjust CHANGES)
+      +1: rjung, jim, ylavic
+
+   *) mod_status: Complete the data shown for async
+      MPMs in "auto" mode.  Added number of processes,
+      number of stopping processes and number
+      of busy and idle workers.
+      trunk: http://svn.apache.org/r1837589
+      2.4.x patch: svn merge -c 1837589 ^/httpd/httpd/trunk . 
+                   (adjust CHANGES)
+      +1: rjung, jim, ylavic
+
+   *) mod_status: Add cumulated response duration time
+      in milliseconds.
+      trunk: http://svn.apache.org/r1837590
+      2.4.x patch: svn merge -c 1837590 ^/httpd/httpd/trunk . 
+                   (adjust CHANGES and include/ap_mmn.h)
+      +1: rjung, jim, ylavic
+
+   *) mod_status: Cumulate CPU time of exited child
+      processes in the "cu" and "cs" values.
+      Add CPU time of the parent process to the
+      "c" and "s" values.
+      trunk: http://svn.apache.org/r1837595
+      2.4.x patch: svn merge -c 1837595 ^/httpd/httpd/trunk . 
+                   (adjust CHANGES and include/ap_mmn.h)
+      +1: rjung, jim, ylavic
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -200,40 +234,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: http://home.apache.org/~jim/patches/socache_redis.patch
       +1: jim,
 
-   *) mod_proxy: Improve the balancer member data shown
-      in mod_status when "ProxyStatus" is "On":
-      add "busy" count and show byte counts in auto
-      mode always in units of kilobytes.
-      trunk: http://svn.apache.org/r1837588
-      2.4.x patch: svn merge -c 1837588 ^/httpd/httpd/trunk . 
-                   (adjust CHANGES)
-      +1: rjung, jim
-
-   *) mod_status: Complete the data shown for async
-      MPMs in "auto" mode.  Added number of processes,
-      number of stopping processes and number
-      of busy and idle workers.
-      trunk: http://svn.apache.org/r1837589
-      2.4.x patch: svn merge -c 1837589 ^/httpd/httpd/trunk . 
-                   (adjust CHANGES)
-      +1: rjung, jim
-
-   *) mod_status: Add cumulated response duration time
-      in milliseconds.
-      trunk: http://svn.apache.org/r1837590
-      2.4.x patch: svn merge -c 1837590 ^/httpd/httpd/trunk . 
-                   (adjust CHANGES and include/ap_mmn.h)
-      +1: rjung, jim
-
-   *) mod_status: Cumulate CPU time of exited child
-      processes in the "cu" and "cs" values.
-      Add CPU time of the parent process to the
-      "c" and "s" values.
-      trunk: http://svn.apache.org/r1837595
-      2.4.x patch: svn merge -c 1837595 ^/httpd/httpd/trunk . 
-                   (adjust CHANGES and include/ap_mmn.h)
-      +1: rjung, jim
-
    *) mod_proxy_hcheck: take balancer's SSLProxy* directives into account.
       trunk patch: http://svn.apache.org/r1836276
       2.4.x patch: trunk patch works