From: Graham Leggett <minfrin@apache.org>
Date: Tue, 18 Sep 2018 21:22:34 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.36~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfdce5a84e250a4825082ac2be5329b677200478;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 11d1d0291f5..80750cc1ed9 100644
--- a/STATUS
+++ b/STATUS
@@ -124,6 +124,10 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   *) mod_proxy_hcheck: Fix issues with TCP health checks. PR 61499
+      trunk patch: http://svn.apache.org/r1840582
+      2.4.x patch: svn merge -c 1840582 ^/httpd/httpd/trunk .
+      +1: jim, ylavic, minfrin
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -207,11 +211,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x branch: svn merge ^/httpd/httpd/branches/tlsv1.3-for-2.4.x
       +1: icing, jorton, 
 
-   *) mod_proxy_hcheck: Fix issues with TCP health checks. PR 61499
-      trunk patch: http://svn.apache.org/r1840582
-      2.4.x patch: svn merge -c 1840582 ^/httpd/httpd/trunk .
-      +1: jim, ylavic,
-
    *) mod_proxy_hcheck: Fix issues with interval determination. PR 62318
       trunk patch: http://svn.apache.org/r1838937
       2.4.x patch: svn merge -c 1838937 ^/httpd/httpd/trunk .