From: Yann Ylavic Date: Tue, 17 May 2022 15:27:39 +0000 (+0000) Subject: Add missing revision in merge command [skip ci]. X-Git-Tag: 2.4.54-rc1-candidate~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=347341a55016ffa04a35062ff20c601cde04b516;p=thirdparty%2Fapache%2Fhttpd.git Add missing revision in merge command [skip ci]. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900996 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 1b2eb27d106..b16fc715918 100644 --- 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