From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 17 Jun 2015 09:53:16 +0000 (+0000)
Subject: Propose mod_substitute merge order fix.
X-Git-Tag: 2.2.30~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0835d3d3e770b1b72a8fd4b8e7494abd6ece42b4;p=thirdparty%2Fapache%2Fhttpd.git

Propose mod_substitute merge order fix.

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

diff --git a/STATUS b/STATUS
index 942a1e70882..fd053725521 100644
--- a/STATUS
+++ b/STATUS
@@ -139,6 +139,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
+  *) mod_substitute: Fix configuraton merge order. PR 57641
+     trunk patch: http://svn.apache.org/r1684900
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: ylavic
+
 
 PATCHES/ISSUES THAT ARE STALLED