Commit cc2fd39e authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Promote.

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