From: Nick Kew <niq@apache.org>
Date: Wed, 28 May 2008 21:06:45 +0000 (+0000)
Subject: Promote
X-Git-Tag: 2.2.9~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1833f1fc7d8d72a09844aff7b4f59579ecd98bfc;p=thirdparty%2Fapache%2Fhttpd.git

Promote


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

diff --git a/STATUS b/STATUS
index 17581b8fd46..7efcb3db46c 100644
--- a/STATUS
+++ b/STATUS
@@ -90,10 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
    * mod_proxy: Support variable interpolation in reverse proxy configuration
      trunk:
        http://svn.apache.org/viewvc?view=rev&revision=421686  (code)
@@ -122,6 +118,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      ftp_directory_charset on trunk and do a MAJOR bump on trunk (where it does
      not really harm).
      Apart from this problem I am +1.
+     niq says: committed the /trunk/ change, made the 2.2.x change
+     you suggest locally.  Taking your +1 and promoting.
+
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
 
    * mod_ssl: Add server name indication (RFC 4366) support (PR 34607).
       Trunk version of patches: