]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Update proposal.
authorYann Ylavic <ylavic@apache.org>
Thu, 12 Oct 2017 19:46:52 +0000 (19:46 +0000)
committerYann Ylavic <ylavic@apache.org>
Thu, 12 Oct 2017 19:46:52 +0000 (19:46 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1812005 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 210f60e4cbe344589cfd9c7ae80be4c2c3a08d2e..3d90fc95c5c591ed3f76964fee3190a4436a7560 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -221,7 +221,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
   *) mod_proxy: Add missing commit from r1808855 (loadfactor now decimal)
      trunk patch: http://svn.apache.org/r1805195
-     2.4.x patch: svn merge -c 1805195 ^/httpd/httpd/trunk .
+     trunk patch: http://svn.apache.org/r1812004 (CHANGES)
+     2.4.x patch: svn merge -c 1805195,1812004 ^/httpd/httpd/trunk .
      +1: ylavic,