Commit 4c252167 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

promote


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833069 13f79535-47bb-0310-9956-ffa450edef68
parent e1cc2708
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -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 ]