* Promote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900941 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 105dc495873ba697528d902749075373181181a2..32e45b640a464384b4fb5ccbde7a3ee6925c117a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -148,6 +148,17 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_proxy: Add backend port to log messages to
+     ease identification of involved service.
+     trunk patches: https://svn.apache.org/r1900028
+     2.4.x patches: svn merge -c 1900028 ^/httpd/httpd/trunk .
+     +1: rjung, jim, rpluem
+
+  *) mod_http2: remove obsolete, insecure code. Fixes PR66037.
+     trunk patches: https://svn.apache.org/r1900356
+     2.4.x patches: svn merge -c 1900356 ^/httpd/httpd/trunk .
+     +1: jailletc36, icing, rpluem
+     icing: I just waited to see what you think!
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -182,18 +193,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      ylavic: I think "extra" should be an apr_size_t.
      icing: added r1899905 with the proposed changes and assertions.
 
-  *) mod_proxy: Add backend port to log messages to
-     ease identification of involved service.
-     trunk patches: https://svn.apache.org/r1900028
-     2.4.x patches: svn merge -c 1900028 ^/httpd/httpd/trunk .
-     +1: rjung, jim, rpluem
-
-  *) mod_http2: remove obsolete, insecure code. Fixes PR66037.
-     trunk patches: https://svn.apache.org/r1900356
-     2.4.x patches: svn merge -c 1900356 ^/httpd/httpd/trunk .
-     +1: jailletc36, icing, rpluem
-     icing: I just waited to see what you think!
-
   *) mod_session: Harden mod_session and avoid overflow in case of indecently large
      session
      trunk patches: https://svn.apache.org/r1900335