]> granicus.if.org Git - apache/commitdiff
Vote, promote.
authorYann Ylavic <ylavic@apache.org>
Thu, 5 Jul 2018 07:56:06 +0000 (07:56 +0000)
committerYann Ylavic <ylavic@apache.org>
Thu, 5 Jul 2018 07:56:06 +0000 (07:56 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835102 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 7d5cfc6a2ec5b977ea9953506fbd1faacdb91ac5..7b2fd1eed8b4e8e2fefbfd1583493a849efd70a3 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -147,6 +147,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://home.apache.org/~jailletc36/backport_1666363.patch
      +1: jailletc36, ylavic, rpluem
 
+  *) reset global ap_server_conf when pconf is cleared (it may be seen by 
+     EXEC_ON_READ directives)
+     trunk patch: http://svn.apache.org/r1835094
+     2.4.x patch: svn merge -c 1835094 ^/httpd/httpd/trunk .
+     +1: covener, rpluem, ylavic
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -206,12 +212,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1801144,1801148,1801456 ^/httpd/httpd/trunk . 
      +1: jailletc36
 
-  *) reset global ap_server_conf when pconf is cleared (it may be seen by 
-     EXEC_ON_READ directives)
-     trunk patch: http://svn.apache.org/r1835094
-     2.4.x patch: svn merge -c 1835094 ^/httpd/httpd/trunk .
-     +1: covener, rpluem
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]