From: Stefan Eissing <icing@apache.org>
Date: Mon, 24 Jun 2024 12:38:32 +0000 (+0000)
Subject: cleanup after merge
X-Git-Tag: 2.4.60-rc1-candidate~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95e41b1b933292cd915120d77131e9e0c432a078;p=thirdparty%2Fapache%2Fhttpd.git

cleanup after merge


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

diff --git a/STATUS b/STATUS
index d10a55d1ebd..b0b1f651e1d 100644
--- a/STATUS
+++ b/STATUS
@@ -153,19 +153,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_proxy: Fix DNS requests and connections closed before the
-     configured addressTTL.  BZ 69126.
-     trunk patch: http://svn.apache.org/r1918228
-                  http://svn.apache.org/r1918410
-                  http://svn.apache.org/r1918412
-                  http://svn.apache.org/r1918429
-                  http://svn.apache.org/r1918438
-                  http://svn.apache.org/r1918442
-     2.4.x patch: trunk works, or
-                  https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/454.diff
-     PR: https://github.com/apache/httpd/pull/454
-     +1: ylavic, jorton, icing
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]