From: Jim Jagielski <jim@apache.org>
Date: Tue, 6 Sep 2016 17:39:25 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.24~261
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ef20c5fdd580d05b401ab755ddcefa578eb9dab;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 13a74df33eb..68fcf988fec 100644
--- a/STATUS
+++ b/STATUS
@@ -117,6 +117,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_status: Delay some memory allocation
+                 Fix <p> tag closing syntax
+     trunk patch: http://svn.apache.org/r1757010
+                  http://svn.apache.org/r1757011
+     2.4.x patch: trunk works
+     +1: jailletc36, jchampion, jim (will fix in 2.4)
+     jchampion: nitpick: r1757010 introduces trailing whitespace
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -193,14 +200,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1750392.patch
      +1: ylavic
 
-   * mod_status: Delay some memory allocation
-                 Fix <p> tag closing syntax
-     trunk patch: http://svn.apache.org/r1757010
-                  http://svn.apache.org/r1757011
-     2.4.x patch: trunk works
-     +1: jailletc36, jchampion, jim (will fix in 2.4)
-     jchampion: nitpick: r1757010 introduces trailing whitespace
-
 PATCHES/ISSUES THAT ARE BEING WORKED
 
   *) http: Don't remove the Content-Length of zero from a HEAD response if