From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 17 Aug 2020 11:57:14 +0000 (+0000)
Subject: * Vote and promote [skip ci]
X-Git-Tag: 2.4.47~286
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b85745c7c85342d1b638725e42c4481f297ef99;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@1880926 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 119a6373a66..51d19a5c09d 100644
--- a/STATUS
+++ b/STATUS
@@ -138,6 +138,12 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_http2: Remove .gitignore. It is not present in trunk and
+     contains problematic entries for our tree (especially Makefile.in).
+
+     2.4.x patch: "svn rm modules/http2/.gitignore"
+     +1 rjung, jim, rpluem
+     -1 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -217,13 +223,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~covener/patches/wstunnel-decline.diff
      +1 covener, jim
 
-  *) mod_http2: Remove .gitignore. It is not present in trunk and
-     contains problematic entries for our tree (especially Makefile.in).
-
-     2.4.x patch: "svn rm modules/http2/.gitignore"
-     +1 rjung, jim
-     -1 
-
   *)  mpm_event: reset listener_is_wakeable on reload.
      trunk patch: http://svn.apache.org/r1877552
      2.4.x patch: svn merge -c 1877552 ^/httpd/httpd/trunk .