From: Jim Jagielski <jim@apache.org>
Date: Wed, 5 Mar 2014 13:30:00 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.8~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e230927f191773cd5a56f13efd49516db75f8e53;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 5357aa58d2a..f5666c8b018 100644
--- a/STATUS
+++ b/STATUS
@@ -97,7 +97,16 @@ RELEASE SHOWSTOPPERS:
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
- 
+
+   * mod_slotmem_shm: debugging help
+     trunk patch: http://svn.apache.org/r1562472
+                  http://svn.apache.org/r1561262
+                  http://svn.apache.org/r1561923
+                  http://svn.apache.org/r1574151
+     2.4.x patch:  trunk works mod/ next_number
+     +1: jim, ylavic, trawick
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -131,14 +140,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://people.apache.org/~jim/patches/uds-rewrite.patch
      +1: jim
 
-   * mod_slotmem_shm: debugging help
-     trunk patch: http://svn.apache.org/r1562472
-                  http://svn.apache.org/r1561262
-                  http://svn.apache.org/r1561923
-                  http://svn.apache.org/r1574151
-     2.4.x patch:  trunk works mod/ next_number
-     +1: jim, ylavic, trawick
-
    * protocol: draft-ietf-httpbis-p1-messaging-23 fixes regarding interactions
                between TE and content-length in the same req/resp.
      trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1524192