]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Clarify merge note.
authorYann Ylavic <ylavic@apache.org>
Fri, 16 Feb 2018 14:52:51 +0000 (14:52 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 16 Feb 2018 14:52:51 +0000 (14:52 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824501 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index d6f16c950d9b7eca90de2cc20891667abb0f2d79..ea410dca93be01d2057aacf287c4a4cd409405b5 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -169,7 +169,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1824497
      2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-event-lingering_close_in_worker.patch
                   (trunk works if mpm_queue above is merged first, otherwise
-                   the mpm_queue can be synchronized after this merge...)
+                   the mpm_queue branch can also be synchronized after this
+                   merge, YMMV :)
      +1: ylavic,
 
   *) mod_ssl: Introduce SSLPolicy/SSLPolicyDefine directives.