From: Gregg Lewis Smith <gsmith@apache.org>
Date: Wed, 10 Apr 2013 19:02:44 +0000 (+0000)
Subject: vote + promote
X-Git-Tag: 2.2.25~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0215cda2dc77baf8e747dc9349290ed86934b16;p=thirdparty%2Fapache%2Fhttpd.git

vote + promote


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

diff --git a/STATUS b/STATUS
index 6c6534bdc6f..b275dc93315 100644
--- a/STATUS
+++ b/STATUS
@@ -95,6 +95,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * installwinconf.awk: install.log output tweaks; reduced path convertion
+    2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=r1390511
+    2.2.x patch: http://people.apache.org/~fuankg/diffs/httpd-2.2.x_installwinconf.diff
+    +1: fuankg, druggeri, gsmith
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -199,11 +204,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.2.x patch: http://people.apache.org/~wrowe/httpd-2.2-quiet-fips.patch
     +1: wrowe, druggeri
 
-  * installwinconf.awk: install.log output tweaks; reduced path convertion
-    2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=r1390511
-    2.2.x patch: http://people.apache.org/~fuankg/diffs/httpd-2.2.x_installwinconf.diff
-    +1: fuankg, druggeri
-
   * mod_proxy_balancer: Add failontimeout parameter. Timeout will put worker
     in error state if an IO timeout is detected.
     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1465839