From: Stefan Eissing <icing@apache.org>
Date: Fri, 2 Aug 2019 09:08:43 +0000 (+0000)
Subject: votenpromote
X-Git-Tag: 2.4.40~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fbd0a52a84778352fbeee365a3a8c02fe073fce;p=thirdparty%2Fapache%2Fhttpd.git

votenpromote

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

diff --git a/STATUS b/STATUS
index 4b623e67554..a6f35485112 100644
--- a/STATUS
+++ b/STATUS
@@ -150,6 +150,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1863635 ^/httpd/httpd/trunk .
      +1: jim, icing, rpluem
 
+  *) core, proxy: remove request URL and headers from error docs
+     trunk: http://svn.apache.org/1864191
+     2.4.x: svn merge  -c 1864191 ^/httpd/httpd/trunk .
+     +1: covener, rpluem, icing
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -181,11 +186,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              reworked, etc.. I would like to avoid a patch that is clearly wrong for some reviewer sitting here for
              months/years without any action item :)
 
-  *) core, proxy: remove request URL and headers from error docs
-     trunk: http://svn.apache.org/1864191
-     2.4.x: svn merge  -c 1864191 ^/httpd/httpd/trunk .
-     +1: covener, rpluem
-
   *) core, rewrite: Set PCRE_DOTALL by default
      trunk: http://svn.apache.org/1864192
      2.4.x: svn merge  -c 1864192 ^/httpd/httpd/trunk .