]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Propose mod_substitute merge order fix.
authorYann Ylavic <ylavic@apache.org>
Wed, 17 Jun 2015 09:53:16 +0000 (09:53 +0000)
committerYann Ylavic <ylavic@apache.org>
Wed, 17 Jun 2015 09:53:16 +0000 (09:53 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1685978 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 942a1e70882c0803004d83f4e5df7634263a4931..fd0537255216aa8274a397ab2477d3ae8fec4699 100644 (file)
--- 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