From: Jeff Trawick <trawick@apache.org>
Date: Tue, 24 Jul 2012 12:20:13 +0000 (+0000)
Subject: sync with 2.4.x/CHANGES (r1365003)
X-Git-Tag: 2.5.0-alpha~6593
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fadb02220dc1c61032444e3cad9f38523a3e15e;p=thirdparty%2Fapache%2Fhttpd.git

sync with 2.4.x/CHANGES (r1365003)


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

diff --git a/CHANGES b/CHANGES
index 0690112e5f7..b0aba5078ea 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,9 +10,6 @@ Changes with Apache 2.5.0
   *) mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/
      DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.  [Jeff Trawick]
 
-  *) mpm_event, mpm_worker: Remain active amidst prevalent child process
-     resource shortages.  [Jeff Trawick]
-
   *) mpm_event: Don't count connections in lingering close state when
      calculating how many additional connections may be accepted.
      [Stefan Fritsch]