]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Add missing revision in merge command [skip ci].
authorYann Ylavic <ylavic@apache.org>
Tue, 17 May 2022 15:27:39 +0000 (15:27 +0000)
committerYann Ylavic <ylavic@apache.org>
Tue, 17 May 2022 15:27:39 +0000 (15:27 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900996 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 1b2eb27d106ecd778159c3b343d828a72be95de1..b16fc715918108cef34c702593e540fbbe428256 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -213,7 +213,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         https://svn.apache.org/r1900991
      Backport version for 2.4.x of patch:
       Trunk version of patch works
-      svn merge -c 1899858,1899865,1899884 ^/httpd/httpd/trunk .
+      svn merge -c 1899858,1899865,1899884,1900991 ^/httpd/httpd/trunk .
      +1: rpluem, ylavic,
      rpluem says: Should we add a CHANGES entry as it seems to fix PR65769?
      ylavic: CHANGES entry added in r1900991