From: Eric Covener <covener@apache.org>
Date: Thu, 1 Jul 2021 18:26:57 +0000 (+0000)
Subject: vote [skip ci]
X-Git-Tag: candidate-2.4.49~3^2~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7cf0428267f7f8dfe7819ab07496e3d21a0a3a4;p=thirdparty%2Fapache%2Fhttpd.git

vote [skip ci]


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

diff --git a/STATUS b/STATUS
index 59b6b6c5550..b426af2782e 100644
--- a/STATUS
+++ b/STATUS
@@ -142,6 +142,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) back port: Add CPING to health check logic - remove hardcoded timeout.
+     Trunk version of patch:
+        https://svn.apache.org/r1887439
+     Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1887439 ^/httpd/httpd/trunk .
+     +1: minfrin, rpluem, covener
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -174,15 +181,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions4.patch
      +1: minfrin
 
-  *) back port: Add CPING to health check logic - remove hardcoded timeout.
-     Trunk version of patch:
-        https://svn.apache.org/r1887439
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1887439 ^/httpd/httpd/trunk .
-     +1: minfrin, rpluem
-
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]