You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by ic...@apache.org on 2021/07/31 14:18:18 UTC

svn commit: r1891923 - /httpd/httpd/branches/2.4.x/STATUS

Author: icing
Date: Sat Jul 31 14:18:18 2021
New Revision: 1891923

URL: http://svn.apache.org/viewvc?rev=1891923&view=rev
Log:
feedback [skip ci]

Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1891923&r1=1891922&r2=1891923&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Jul 31 14:18:18 2021
@@ -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