httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1820849 - /httpd/httpd/branches/2.4.x/STATUS
Date Thu, 11 Jan 2018 09:20:03 GMT
Author: ylavic
Date: Thu Jan 11 09:20:03 2018
New Revision: 1820849

URL: http://svn.apache.org/viewvc?rev=1820849&view=rev
Log:
Note about how to separate the two changes for the real backport(s).


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=1820849&r1=1820848&r2=1820849&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Jan 11 09:20:03 2018
@@ -226,7 +226,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      ylavic: joint proposal because the second change depends on the
              ap_update_child_status() added by the first one. Hopefully the
              first change is simple enough, the second one is quite straight
-             forward too.
+             forward too. We can really separate the two changes for the real
+             backport; once the first patch (event_ka_status.diff + records)
+             is applied, svn merge -c 1802618,1820808 ^/httpd/httpd/trunk .
+             works (modulo CHANGES).
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED



Mime
View raw message