You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by wr...@apache.org on 2015/06/30 00:56:03 UTC

svn commit: r1688326 - /httpd/httpd/branches/2.4.x/STATUS

Author: wrowe
Date: Mon Jun 29 22:56:03 2015
New Revision: 1688326

URL: http://svn.apache.org/r1688326
Log:
Similarly, wouldn't hold up 2.4.next for this not-ready patch

Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1688326&r1=1688325&r2=1688326&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jun 29 22:56:03 2015
@@ -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+),