From: Graham Leggett <minfrin@apache.org>
Date: Sat, 18 Nov 2023 10:14:42 +0000 (+0000)
Subject: Recreate the patch with r1745033 included, reset the vote.
X-Git-Tag: 2.4.59-rc1-candidate~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ec30bbeac7a72c9b9818cf5024232787bee2522;p=thirdparty%2Fapache%2Fhttpd.git

Recreate the patch with r1745033 included, reset the vote.


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

diff --git a/STATUS b/STATUS
index 7529bfb3348..bc38c8ca695 100644
--- a/STATUS
+++ b/STATUS
@@ -167,11 +167,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         https://svn.apache.org/r1596108
         https://svn.apache.org/r1745033
      Backport version for 2.4.x of patch:
-        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-ldap-search.patch
-        svn merge -c r1745033 ^/httpd/httpd/trunk .
-     +1: minfrin, jim,
-     jailletc36: r1745033 seems related and should in included
-     minfrin: r1745033 is now included
+        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-ldap-search2.patch
+     +1: minfrin
 
   *) mod_proxy: Allow to set a TTL for how long DNS resolutions to backend
      systems are cached.