From: Stefan Eissing <icing@apache.org>
Date: Mon, 16 Aug 2021 14:30:57 +0000 (+0000)
Subject: update after merge. [skip ci]
X-Git-Tag: candidate-2.4.49~3^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=864a3dba54fc8f312c9900901d1cda101e5d913b;p=thirdparty%2Fapache%2Fhttpd.git

update after merge. [skip ci]


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

diff --git a/STATUS b/STATUS
index 2aed492b600..ff6ea1d92b5 100644
--- a/STATUS
+++ b/STATUS
@@ -266,12 +266,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              + make update-changes
      +1: ylavic,
 
- *) core: ap_timeout_parameter_parse UBI fuzz fix followup
-    trunk patch: http://svn.apache.org/r1892185
-    trunk patch: http://svn.apache.org/r1892207
-    svn merge -c 1892185,1892207 ^/httpd/httpd/trunk .
-    +1: covener, icing, jorton, jim
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]