Merge r1809273, r1814719 from trunk:

[apache] / STATUS

diff --git a/STATUS b/STATUS
index 87bafa7c80f1e7b22971ee77ead1aa7721980056..9ff8e1d869e7140677f62c087492a48b7b6606d0 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -118,14 +118,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mpm_event: avoid a very unlikely race condition between the listener and
-     the workers when the latter fails to add a connection to the pollset.
-     trunk patch: http://svn.apache.org/r1809273
-                  http://svn.apache.org/r1814719 (CHANGES only)
-     2.4.x patch: trunk works (modulo CHANGES)
-                  svn merge -c 1809273,1814719 ^/httpd/httpd/trunk .
-     +1: ylavic, jim, covener
-
   *) core: silently ignore a not existent file path when IncludeOptional is used.
      trunk patch: http://svn.apache.org/r1814968
      2.4.x patch: trunk works (modulo CHANGES)