From 8c7a4b16b1b4584a2d07656a861842ea4674b3d6 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Mon, 24 Feb 2020 14:56:48 +0000 Subject: [PATCH] Promote and [skip ci]. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874454 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/STATUS b/STATUS index eb7eca9a3da..e2a323b19c8 100644 --- a/STATUS +++ b/STATUS @@ -129,6 +129,9 @@ CURRENT RELEASE NOTES: RELEASE SHOWSTOPPERS: +PATCHES ACCEPTED TO BACKPORT FROM TRUNK: + [ start all new proposals below, under PATCHES PROPOSED. ] + *) mod_proxy_ajp: Allow secret= parameter for AJP which is now suggested/required by tomcat trunk patch: http://svn.apache.org/r1738878 @@ -136,10 +139,6 @@ RELEASE SHOWSTOPPERS: (trivial conflict in mod_proxy.c) +1: covener, jorton, rjung -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 ] -- 2.47.3