From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 31 Mar 2016 14:35:45 +0000 (+0000)
Subject: Upvotes for promotion
X-Git-Tag: 2.4.20~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b41369dec20daf58a440ccf67af991b4a79ee10;p=apache

Upvotes for promotion

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

diff --git a/STATUS b/STATUS
index a72f67e0d7..f775ded4d6 100644
--- a/STATUS
+++ b/STATUS
@@ -120,6 +120,25 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk patch works
      +1: jailletc36, sf, ylavic
 
+  *) Synch 2.4.x with trunk - merge some multi-line log messages in MPMs (+ one style 
+     adjustment in mpm_netware.c, merged accidendly)
+     Trunk patch: http://svn.apache.org/r1731929
+                  http://svn.apache.org/r1736681
+     2.4.x patch: http://home.apache.org/~jailletc36/1731929.diff
+     +1: jailletc36, ylavic, wrowe
+
+  *) mod_proxy_express: Fix possible use of DB handle after close.  PR 59230.
+     trunk patch: http://svn.apache.org/r1737014
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: ylavic, trawick, wrowe
+
+  *) core: Do not read .htaccess if AllowOverride and AllowOverrideList
+     are "None". PR 58528.
+     trunk patch: http://svn.apache.org/r1737114
+     2.4.x patch: http://people.apache.org/~druggeri/patches/2.4.x.AllowOverrideListFix.PR58528.patch
+     +1: druggeri, ylavic, wrowe
+     ylavic: please also apply r1737148 on merge to fix the typo on "Ruediger" (CHANGES entry)
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -181,25 +200,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: trawick
      ylavic: there may be missing bits, see thread for commit r1736510.
 
-  *) Synch 2.4.x with trunk - merge some multi-line log messages in MPMs (+ one style 
-     adjustment in mpm_netware.c, merged accidendly)
-     Trunk patch: http://svn.apache.org/r1731929
-                  http://svn.apache.org/r1736681
-     2.4.x patch: http://home.apache.org/~jailletc36/1731929.diff
-     +1: jailletc36, ylavic
-
-  *) mod_proxy_express: Fix possible use of DB handle after close.  PR 59230.
-     trunk patch: http://svn.apache.org/r1737014
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, trawick
-
-  *) core: Do not read .htaccess if AllowOverride and AllowOverrideList
-     are "None". PR 58528.
-     trunk patch: http://svn.apache.org/r1737114
-     2.4.x patch: http://people.apache.org/~druggeri/patches/2.4.x.AllowOverrideListFix.PR58528.patch
-     +1: druggeri, ylavic
-     ylavic: please also apply r1737148 on merge to fix the typo on "Ruediger" (CHANGES entry)
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED