From: Graham Leggett <minfrin@apache.org>
Date: Tue, 18 Sep 2018 21:14:07 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.4.36~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=095799213fbafbacf1f1bf1e3d50ae1c126be533;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote.


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

diff --git a/STATUS b/STATUS
index 93ef15369b4..d01a468b33e 100644
--- a/STATUS
+++ b/STATUS
@@ -124,6 +124,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   *) mod_proxy_hcheck: take balancer's SSLProxy* directives into account.
+      trunk patch: http://svn.apache.org/r1836276
+      2.4.x patch: svn merge -c 1836276 ^/httpd/httpd/trunk .
+      +1: jim, ylavic, minfrin
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -175,11 +180,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: http://home.apache.org/~jim/patches/socache_redis.patch
       +1: jim,
 
-   *) mod_proxy_hcheck: take balancer's SSLProxy* directives into account.
-      trunk patch: http://svn.apache.org/r1836276
-      2.4.x patch: svn merge -c 1836276 ^/httpd/httpd/trunk .
-      +1: jim, ylavic
-
   *) MPMs: Initialize all runtime/asynchronous objects on a dedicated pool and
      before signals handling to avoid lifetime issues on restart or shutdown.
      PR 62658.