]> granicus.if.org Git - apache/commitdiff
promote
authorJim Jagielski <jim@apache.org>
Wed, 6 Jun 2018 19:02:50 +0000 (19:02 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 6 Jun 2018 19:02:50 +0000 (19:02 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833069 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index dfb506da98a9f4dbcea92780036c3559c2cfd7cf..99f7de9489bfb876dc6795e482e82fc6d2043cc2 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -133,6 +133,10 @@ RELEASE SHOWSTOPPERS:
      2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-balancer_slotmem-v2.patch
      +1: ylavic, jim
 
+
+PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
+  [ start all new proposals below, under PATCHES PROPOSED. ]
+
   *) mod_remoteip: Fix RemoteIP{Trusted,Internal}ProxyList loading broken by 2.4.30.
                    PR 62220.
      trunk patch: https://svn.apache.org/r1832580
@@ -141,9 +145,6 @@ RELEASE SHOWSTOPPERS:
                   svn merge -c 1832580,1832581 ^/httpd/httpd/trunk .
      +1: ylavic, wrowe, jim
 
-PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
-  [ start all new proposals below, under PATCHES PROPOSED. ]
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]