From: Philip M. Gollucci <pgollucci@apache.org>
Date: Wed, 26 Nov 2008 22:46:46 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.2.11~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b70e256ea12d1be2802d086ec090aed7e469aeb;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index daa05f1c206..d8926d67e5a 100644
--- a/STATUS
+++ b/STATUS
@@ -85,6 +85,14 @@ RELEASE SHOWSTOPPERS:
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
+   * mod_log_config: Add in useful feature, %k which logs the keepalives
+     value. PR: 45762
+      Trunk version of patch:
+        http://svn.apache.org/viewvc?view=rev&revision=693120
+        http://svn.apache.org/viewvc?view=rev&revision=720250
+      Backport version for 2.2.x of patch:
+         Trunk version of patch works (minus CHANGES conflict)
+      +1: jim, rpluem, pgolluci
 
   * srclib/pcre and vendor/pcre
     http://www.vuxml.org/freebsd/pkg-pcre.html
@@ -124,14 +132,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       -1: rpluem: jorton found some problems with the trunk version and they
                   should be fixed / discussed in trunk before we backport.
 
-   * mod_log_config: Add in useful feature, %k which logs the keepalives
-     value. PR: 45762
-      Trunk version of patch:
-        http://svn.apache.org/viewvc?view=rev&revision=693120
-        http://svn.apache.org/viewvc?view=rev&revision=720250
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works (minus CHANGES conflict)
-      +1: jim, rpluem, pgolluci
 
 PATCHES/ISSUES THAT ARE STALLED