From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 12 Oct 2017 19:46:52 +0000 (+0000)
Subject: Update proposal.
X-Git-Tag: 2.4.29~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7942b8bb1cd665872cb76368bb9eb62a37195083;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal.

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

diff --git a/STATUS b/STATUS
index 210f60e4cbe..3d90fc95c5c 100644
--- 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,