From: Stefan Eissing <icing@apache.org>
Date: Fri, 5 Jul 2019 07:16:23 +0000 (+0000)
Subject: vote
X-Git-Tag: 2.4.40~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7b15d51dcc0981f64a536c2d1dd0947fb008be0;p=thirdparty%2Fapache%2Fhttpd.git

vote

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

diff --git a/STATUS b/STATUS
index 565f334d4bd..1586eef3719 100644
--- a/STATUS
+++ b/STATUS
@@ -127,6 +127,10 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) Kill export of "nul" symbol.
+     trunk: http://svn.apache.org/r1861690
+     2.4.x: svn merge -c 1861690 ^/httpd/httpd/trunk .
+     +1: jorton, jfclere, icing
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -212,11 +216,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x: svn merge -c 1858565 ^/httpd/httpd/trunk .
      +1: jorton,
 
-  *) Kill export of "nul" symbol.
-     trunk: http://svn.apache.org/r1861690
-     2.4.x: svn merge -c 1861690 ^/httpd/httpd/trunk .
-     +1: jorton, jfclere
-
   *) mod_proxy_hcheck fix for BZ 60948
      trunk: http://svn.apache.org/r1862014
      2.4.x: svn merge -c 1862014 ^/httpd/httpd/trunk .