From: Guenter Knauf <fuankg@apache.org>
Date: Sat, 25 May 2013 00:31:40 +0000 (+0000)
Subject: promote.
X-Git-Tag: 2.4.5~229
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=076ad5146cca656daf5a131b9ae028474d6c112d;p=apache

promote.


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

diff --git a/STATUS b/STATUS
index 49acf02f95..56f793cf7d 100644
--- a/STATUS
+++ b/STATUS
@@ -115,6 +115,10 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk patch works (minus CHANGES)
       +1: minfrin, jim, jorton
 
+    * ap_release.h: Make AP_SERVER_ADD_STRING define-able from CFLAGS.
+      trunk patch: http://svn.apache.org/r1481955
+      2.4.x patch: trunk works (with fuzz)
+      +1: fuankg, minfrin, humbedooh
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -312,11 +316,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk works, modulo CHANGES
       +1: jim, minfrin
 
-    * ap_release.h: Make AP_SERVER_ADD_STRING define-able from CFLAGS.
-      trunk patch: http://svn.apache.org/r1481955
-      2.4.x patch: trunk works (with fuzz)
-      +1: fuankg, minfrin, humbedooh
-
     * mod_proxy_http: Make the proxy-interim-response environment variable
       effective by formally overriding origin server behaviour.
       trunk patch: http://svn.apache.org/r1483027