From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 22 Jul 2021 18:40:46 +0000 (+0000)
Subject: CHANGES entries now included in the patches [skip ci]
X-Git-Tag: candidate-2.4.49~3^2~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f1d2a8b38f04f10a82b088b796fec6db70f9307;p=thirdparty%2Fapache%2Fhttpd.git

CHANGES entries now included in the patches [skip ci]

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

diff --git a/STATUS b/STATUS
index 31ee685c920..5d531bab8c3 100644
--- a/STATUS
+++ b/STATUS
@@ -268,8 +268,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1891728
      backport: wget http://people.apache.org/~ylavic/patches/2.4.x-mpm_event_graceful_linger.patch
              + patch -p0 < 2.4.x-mpm_event_graceful_linger.patch
-             + svn merge --record-only -c 1891716-1891719,1891721,1891724,1891726-1891727 ^/httpd/httpd/trunk .
-             + svn merge -c 1891728 ^/httpd/httpd/trunk .
+             + svn merge --record-only -c 1891716-1891719,1891721,1891724,1891726-1891728 ^/httpd/httpd/trunk .
              + make update-changes
      +1: ylavic,
 
@@ -280,7 +279,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      backport: wget http://people.apache.org/~ylavic/patches/2.4.x-bz_65419+65429.patch
              + patch -p0 < 2.4.x-bz_65419+65429.patch
              + svn merge --record-only -c 1891206,1891284 ^/httpd/httpd/trunk .
-             + sed -i -e 's/mpm_proxy/mod_proxy/' -e 's/PR 65419/PR 65419 + 65429/' changes-entries/proxy_define_matchable_worker.txt
              + make update-changes
      +1: ylavic,