From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 14 Apr 2016 21:12:30 +0000 (+0000)
Subject: Update proposal (referrer version, CHANGES entry).
X-Git-Tag: 2.4.21~247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bf9ad5e04e18ab47f6b1d3605a432dd7ac027cd;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal (referrer version, CHANGES entry).

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

diff --git a/STATUS b/STATUS
index 6462cbc5bc2..ade2ddb3572 100644
--- a/STATUS
+++ b/STATUS
@@ -188,11 +188,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: http://svn.apache.org/r1739008
      trunk patch: http://svn.apache.org/r1739146
      trunk patch: http://svn.apache.org/r1739151
+     trunk patch: http://svn.apache.org/r1739193
      2.4.x patch: trunk works (modulo CHANGES) or
-                  http://home.apache.org/~ylavic/patches/httpd-2.4.x-scoreboard_preserve.patch
+                  http://home.apache.org/~ylavic/patches/httpd-2.4.x-scoreboard_preserve-v2.patch
      +1: ylavic
-     ylavic: diff with 2.4.19 after this merge:
-             http://home.apache.org/~ylavic/patches/scoreboard-2.4.19.diff
+     ylavic: diff with 2.4.18 after this merge:
+             http://home.apache.org/~ylavic/patches/scoreboard-2.4.18.diff
 
   
 PATCHES/ISSUES THAT ARE BEING WORKED