From: Jim Jagielski <jim@apache.org>
Date: Tue, 14 Aug 2018 12:21:52 +0000 (+0000)
Subject: and promote those with 3 +1s
X-Git-Tag: 2.4.35~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a84f47828a29685f3f4b9b1cb453e167ed77466;p=apache

and promote those with 3 +1s



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

diff --git a/STATUS b/STATUS
index 0cd14c34e7..08ea11fe7c 100644
--- a/STATUS
+++ b/STATUS
@@ -131,6 +131,17 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: jailletc36, ylavic (by inspection), covener
      jailletc36: untested, but looks straight forward enough to vote
 
+   * core: maintainer mode fix for #if AP_ENABLE_EXCEPTION_HOOK
+      trunk: http://svn.apache.org/r1809135
+      2.4.x patch: svn merge -c 1809135 ^/httpd/httpd/trunk .
+      +1: covener, rjung, jim
+
+   *) core: allow quoted paths in <IfFile>
+      trunk: http://svn.apache.org/r1797844
+      2.4.x patch: svn merge -c 1797844 ^/httpd/httpd/trunk .
+      +1: jailletc36, covener, jim
+      jailletc36: once backported, iffile.t can be enabled
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -227,17 +238,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                    (adjust CHANGES and include/ap_mmn.h)
       +1: rjung, jim
 
-   * core: maintainer mode fix for #if AP_ENABLE_EXCEPTION_HOOK
-      trunk: http://svn.apache.org/r1809135
-      2.4.x patch: svn merge -c 1809135 ^/httpd/httpd/trunk .
-      +1: covener, rjung, jim
-
-   *) core: allow quoted paths in <IfFile>
-      trunk: http://svn.apache.org/r1797844
-      2.4.x patch: svn merge -c 1797844 ^/httpd/httpd/trunk .
-      +1: jailletc36, covener, jim
-      jailletc36: once backported, iffile.t can be enabled
-
   *) Easy patches: synch 2.4.x and trunk
      - mod_ssl: Tweak logging message
      - mod_ssl: make ssl_io_data_dump respect per-conn loglevel