]> granicus.if.org Git - apache/commitdiff
Promote.
authorYann Ylavic <ylavic@apache.org>
Tue, 29 May 2018 18:33:26 +0000 (18:33 +0000)
committerYann Ylavic <ylavic@apache.org>
Tue, 29 May 2018 18:33:26 +0000 (18:33 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832466 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 4e21d9e2698b5a0efa168b32db2988b36ab3c08b..74ca33027834570b7f82ae658f9a078ab9b6ef5f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -140,17 +140,14 @@ RELEASE SHOWSTOPPERS:
      2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-balancer_slotmem.patch
      +1: ylavic, jim
 
+PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
+  [ start all new proposals below, under PATCHES PROPOSED. ]
+
   *) mod_ssl: Restore 2.4.29 behaviour in SSL vhost merging/enabling
               which broke some rare but previously-working configs.
      trunk patch: https://svn.apache.org/r1829513
      2.4.x patch: svn merge -c 1829513 ^/httpd/httpd/trunk .
-     +1: jorton, jim
-
-
-PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
-  [ start all new proposals below, under PATCHES PROPOSED. ]
-
-
+     +1: jorton, jim, ylavic
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]