]> granicus.if.org Git - apache/commitdiff
Similarly, wouldn't hold up 2.4.next for this not-ready patch
authorWilliam A. Rowe Jr <wrowe@apache.org>
Mon, 29 Jun 2015 22:56:03 +0000 (22:56 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Mon, 29 Jun 2015 22:56:03 +0000 (22:56 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1688326 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 0f9a7f32ee14892cfc74566953f1ff2b27f12875..564f77f9eebb5aef2a267b7846b752cbe7f8a289 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -214,6 +214,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1687680
      2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore-v2.patch
      +1: ylavic
+     -1: wrowe - dir merge corrupts RHS config, must be const, a-> is result
      ylavic: added r1687539 and discarded minfrin's vote (we must preserve
              the current behaviour).  SubstituteInheritBefore allows to
              configure the merge order; the default is Off in trunk (2.5+),