From: Jim Jagielski <jim@apache.org>
Date: Tue, 28 Aug 2007 14:55:17 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.2.6~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4122244c8eecf3c2add2b5854e2f45d8c2725ae3;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 6168ab3d3d1..e7243709ed4 100644
--- a/STATUS
+++ b/STATUS
@@ -79,6 +79,19 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    * mod_negotiation: Preserve Query String when resolving a type map
+      PR: 33112
+      http://svn.apache.org/viewvc?view=rev&revision=565671
+      +1: niq, wrowe, rpluem
+
+    * log core: ensure we use a special pool for stderr logging, so that
+      the stderr channel remains valid from the time plog is destroyed,
+      until the time the open_logs hook is called again.  [William Rowe]
+        http://svn.apache.org/viewvc?view=rev&revision=569535
+      Backported to 2.2;
+        http://people.apache.org/~wrowe/r569535-backport-2.2-r2.patch
+      +1: wrowe, jim, rpluem
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
@@ -188,20 +201,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       trawick says: The new directives should be documented in trunk,
           so that docs are available for backport at the same time.
 
-    * mod_negotiation: Preserve Query String when resolving a type map
-      PR: 33112
-      http://svn.apache.org/viewvc?view=rev&revision=565671
-      +1: niq, wrowe, rpluem
-
-    * log core: ensure we use a special pool for stderr logging, so that
-      the stderr channel remains valid from the time plog is destroyed,
-      until the time the open_logs hook is called again.  [William Rowe]
-        http://svn.apache.org/viewvc?view=rev&revision=569535
-      Backported to 2.2;
-        http://people.apache.org/~wrowe/r569535-backport-2.2-r2.patch
-      +1: wrowe, jim, rpluem
-
-
 PATCHES/ISSUES THAT ARE STALLED
 
     * PKCS#7: backport PCKS#7 patches from trunk.