From: Rainer Jung <rjung@apache.org>
Date: Tue, 5 Oct 2010 19:39:01 +0000 (+0000)
Subject: Promote
X-Git-Tag: 2.0.64~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0af22b87a26503e572b88d7dad751a0c2deeff8f;p=thirdparty%2Fapache%2Fhttpd.git

Promote


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

diff --git a/STATUS b/STATUS
index e289250a04a..0c283798f4c 100644
--- a/STATUS
+++ b/STATUS
@@ -132,6 +132,12 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * gen_test_char.c: rename macro to a better name and sync with trunk.
+    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1001398
+    2.2.x patch: http://people.apache.org/~fuankg/diffs/gen_test_char.c.diff
+    2.0.x patch: 2.2.x patch applies with offset.
+    +1: fuankg, wrowe, rjung
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new
@@ -198,12 +204,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     Revert r1002205 in test framework, once this is fixed.
     +1: rjung, wrowe
 
-  * gen_test_char.c: rename macro to a better name and sync with trunk.
-    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1001398
-    2.2.x patch: http://people.apache.org/~fuankg/diffs/gen_test_char.c.diff
-    2.0.x patch: 2.2.x patch applies with offset.
-    +1: fuankg, wrowe, rjung
-
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
 
     *) mod_headers: Support {...}s tag for SSL variable lookup.