From: Luca Toscano <elukey@apache.org>
Date: Sun, 2 Feb 2020 17:24:36 +0000 (+0000)
Subject: Promote
X-Git-Tag: 2.4.42~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3afcc1f595418e70d5b4c1d7eeacc33f91570c0;p=thirdparty%2Fapache%2Fhttpd.git

Promote

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

diff --git a/STATUS b/STATUS
index 4b433ec2f60..7b3c502f044 100644
--- a/STATUS
+++ b/STATUS
@@ -132,6 +132,22 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_systemd: New module, for integration with systemd on Linux.
+     trunk patch: http://svn.apache.org/r1393976
+                  http://svn.apache.org/r1393997
+                  http://svn.apache.org/r1484554
+                  http://svn.apache.org/r1528032
+                  http://svn.apache.org/r1528034
+                  http://svn.apache.org/r1614821
+                  http://svn.apache.org/r1618579
+                  http://svn.apache.org/r1618588
+                  http://svn.apache.org/r1802251
+                  http://svn.apache.org/r1840554
+                  http://svn.apache.org/r1840555
+                  http://svn.apache.org/r1872761
+                  http://svn.apache.org/r1872763
+     2.4.x patch: http://people.apache.org/~jorton/httpd-2.4.x-mod_systemd.patch
+     +1: jorton, jim, elukey
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -209,23 +225,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1872786 ^/httpd/httpd/trunk
      +1: jim, jorton
 
-   * mod_systemd: New module, for integration with systemd on Linux.
-     trunk patch: http://svn.apache.org/r1393976
-                  http://svn.apache.org/r1393997
-                  http://svn.apache.org/r1484554
-                  http://svn.apache.org/r1528032
-                  http://svn.apache.org/r1528034
-                  http://svn.apache.org/r1614821
-                  http://svn.apache.org/r1618579
-                  http://svn.apache.org/r1618588
-                  http://svn.apache.org/r1802251
-                  http://svn.apache.org/r1840554
-                  http://svn.apache.org/r1840555
-                  http://svn.apache.org/r1872761
-                  http://svn.apache.org/r1872763
-     2.4.x patch: http://people.apache.org/~jorton/httpd-2.4.x-mod_systemd.patch
-     +1: jorton, jim, elukey
-
    * mod_cgi, mod_cgid: Fix a memory leak when discarding script output
      after various error conditions.  PR 64096
      trunk patch: https://svn.apache.org/r1867970