Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1687698 - /httpd/httpd/branches/2.2.x/STATUS
Date: Fri, 26 Jun 2015 07:43:47 -0000
To: cvs@httpd.apache.org
From: ylavic@apache.org
Message-Id: <20150626074347.3E67AAC0256@hades.apache.org>

Author: ylavic
Date: Fri Jun 26 07:43:46 2015
New Revision: 1687698

URL: http://svn.apache.org/r1687698
Log:
Note discarded vote and refer to 2.2.x instead of 2.4.x for the backport.

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

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1687698&r1=1687697&r2=1687698&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Jun 26 07:43:46 2015
@@ -111,10 +111,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1687680
      2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-SubstituteInheritBefore-v2.patch
      +1: ylavic
-     ylavic: SubstituteInheritBefore allows to configure the merge order;
-             the default is Off in trunk (2.5+), but still On in 2.4.x thanks to
-             the changes in the backport patch only
-             => over->inherit_before = (base->inherit_before != 0) instead
+     ylavic: added r1687539 and r1687680 discarding minfrin's vote (we must
+             preserve the current behaviour). SubstituteInheritBefore allows to
+             configure the merge order; the default is Off in trunk (2.5+),
+             but still On in 2.2.x thanks to the changes in the backport patch
+             only => over->inherit_before = (base->inherit_before != 0) instead
              of (base->inherit_before > 0), plus the doc updated accordingly.
 
 PATCHES/ISSUES THAT ARE STALLED