From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 11 Jan 2018 09:20:03 +0000 (+0000)
Subject: Note about how to separate the two changes for the real backport(s).
X-Git-Tag: 2.4.30~162
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d9760ec983f16ffc0acaa51e4b2585840b6b9d3;p=apache

Note about how to separate the two changes for the real backport(s).



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

diff --git a/STATUS b/STATUS
index c41be1e902..47e80eac7d 100644
--- a/STATUS
+++ b/STATUS
@@ -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