Update proposal.

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

diff --git a/STATUS b/STATUS
index 17620c873f003246caa6d37774bf5b25bcea4c1d..1fe65f1c1ca635368df5eb8007b832a974322e4c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -265,9 +265,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      issued as-is.
      Trunk version of patch:
         https://svn.apache.org/r1861542
+        https://svn.apache.org/r1861569
      Backport version for 2.4.x of patch:
       Trunk version of patch works
-       svn merge -c 1861542 ^/httpd/httpd/trunk .
+       svn merge -c 1861542,r1861569 ^/httpd/httpd/trunk .
      +1: minfrin