Merge r420307 from trunk:

* Add the filename of the configuration file to the warning message
  about the useless use of AllowOverride.

PR: 39992
Submitted by: Darryl Miles <darryl darrylmiles.org>
Reviewed by: rpluem, jim, pquerna

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

diff --git a/STATUS b/STATUS
index bc0625cd517bcb3c245677178befcb4b63e3e09c..43d4563f0006c88d00fda7676f62fc4eb66e4bb9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,14 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * core: Add the filename of the configuration file to the warning message
-   about the useless use of AllowOverride. PR 39992
-    Trunk version of patch:
-       http://svn.apache.org/viewvc?rev=420307&view=rev
-    Backport version for 2.2.x of patch:
-       Trunk version of patch works
-    +1: rpluem, jim, pquerna
-
  * htpasswd: Fix salt generation weakness. PR 31440
    [Andreas Krennmair <ak synflood.at>, Peter Watkins <peterw tux.org>, Paul Querna]
     Trunk version of patch: