From: Stefan Eissing <icing@apache.org>
Date: Sat, 31 Jul 2021 14:18:18 +0000 (+0000)
Subject: feedback [skip ci]
X-Git-Tag: candidate-2.4.49~3^2~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1f209f6f62b6c8ba6e8faa958021d499e1ec269;p=thirdparty%2Fapache%2Fhttpd.git

feedback [skip ci]


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

diff --git a/STATUS b/STATUS
index 03e4db1ebe8..cd121d55887 100644
--- a/STATUS
+++ b/STATUS
@@ -313,6 +313,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
           https://svn.apache.org/r1891200
      2.4.x patch: svn merge -c 1817063,1831165,1831171,1831172,1849590,1849630,1856491,1883421,1889327,1891200 ^/httpd/httpd/trunk .
      +1: jailletc36
+     icing: I have trouble running the svn merge due to conflicts in CHANGES and
+            the infamous log tags. Do you have a patch or a PR to use for checking?
 
   *) core: add hook 'child_stoppingthat gets called when the MPM is stopping a
      child process. The additionalgraceful` parameter allows registered hooks