merges++

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

diff --git a/STATUS b/STATUS
index 15965457106062b278ea91c93a4620a3d066d8b3..d0d445db861633bcfc198c0b759a2b3de7997164 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/10/29 16:40:45 $]
+Last modified at [$Date: 2003/10/30 19:40:29 $]
 
 Release:
 
@@ -279,6 +279,11 @@ PATCHES TO BACKPORT FROM 2.1
         server/protocol.c r1.137
       +1: trawick, striker
 
+    * mod_status: Report total CPU time accurately when using a
+      threaded MPM.  PR: 23795
+        modules/generators/mod_status.c r1.75
+      +1: trawick
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,