]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Vote and promote.
authorGraham Leggett <minfrin@apache.org>
Mon, 21 Jun 2021 17:02:13 +0000 (17:02 +0000)
committerGraham Leggett <minfrin@apache.org>
Mon, 21 Jun 2021 17:02:13 +0000 (17:02 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1890946 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 287fa5a5d316bf9e4f691a0274ebd4e89cf07e39..f9a5ddb882a959b341067ead10a52357f6fc1c40 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -142,6 +142,14 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   *) back port: Add CPING to health check logic.
+     Trunk version of patch:
+        https://svn.apache.org/r1887415
+     Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1887415 ^/httpd/httpd/trunk .
+     +1: jfclere, jim, minfrin
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -166,14 +174,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: jfclere, jim
      minfrin: tiny cleanup needed: warning: unused function 'safe_referer'
 
-   *) back port: Add CPING to health check logic.
-     Trunk version of patch:
-        https://svn.apache.org/r1887415
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1887415 ^/httpd/httpd/trunk .
-     +1: jfclere, jim
-
   *) Add dav_get_provider(), dav_open_lockdb(), dav_close_lockdb() and
      dav_get_resource() to mod_dav.h.
      trunk patch: http://svn.apache.org/r1879305