From: Stefan Eissing <icing@apache.org>
Date: Mon, 6 Sep 2021 08:10:31 +0000 (+0000)
Subject: vote and promote. [skip ci]
X-Git-Tag: candidate-2.4.49-rc1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6019693dee4279792a47f6708670f5cf3200ba6b;p=thirdparty%2Fapache%2Fhttpd.git

vote and promote. [skip ci]


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

diff --git a/STATUS b/STATUS
index 118b49bd774..cfc6024520e 100644
--- a/STATUS
+++ b/STATUS
@@ -161,6 +161,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1892914 ^/httpd/httpd/trunk .
      +1: jailletc36, icing, jorton
 
+  *) mod_unique_id: Reduce the time window where duplicates may be generated
+     PR 65159
+     trunk patch: http://svn.apache.org/r1892915
+     2.4.x patch: svn merge -c 1892915 ^/httpd/httpd/trunk .
+     +1: jailletc36, jorton, icing
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -192,12 +198,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
            PR: https://github.com/apache/httpd/pull/203
      +1: icing, minfrin
 
-  *) mod_unique_id: Reduce the time window where duplicates may be generated
-     PR 65159
-     trunk patch: http://svn.apache.org/r1892915
-     2.4.x patch: svn merge -c 1892915 ^/httpd/httpd/trunk .
-     +1: jailletc36, jorton
-
   *) mpm_prefork: mask signals during ap_run_child_init()
      trunk patch: http://svn.apache.org/r1890465
      2.4.x patch: svn merge -c 1890465 ^/httpd/httpd/trunk .