From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 22 May 2017 20:54:41 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.4.26~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c0b7a7b46b652f65f3d6784de67fdb5a9b08f60;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote.

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

diff --git a/STATUS b/STATUS
index 0974ffcbeaa..95fa4fef9e8 100644
--- a/STATUS
+++ b/STATUS
@@ -126,12 +126,18 @@ RELEASE SHOWSTOPPERS:
 
       trunk patch: https://svn.apache.org/r1795830
       2.4.x patch: trunk works
-      +1: jchampion
+      +1: jchampion, ylavic
 
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) core: evaluate nested If/ElseIf/Else sections rather than silently ignore
+     them.
+     trunk patch: http://svn.apache.org/r1792589
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: elukey, jim, yalvic
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -197,12 +203,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch:  svn merge -c 1776463 1776708 ^/httpd/httpd/trunk .
      +1: covener, jim
 
-  *) core: evaluate nested If/ElseIf/Else sections rather than silently ignore
-     them.
-     trunk patch: http://svn.apache.org/r1792589
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: elukey, jim
-
   *) mod_rewrite: allow users to workaround the over-agressive backreference
                   escaping by selecting the characters to escape
      mod_rewrite: add BNP flag (backrefnoplus)