Merged x1, [skip ci]

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

diff --git a/STATUS b/STATUS
index 8767159942cc4cabf4596d37720d1d6530cdf7e4..e645651653b2ad5647adde1c97fd18540d001502 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -156,14 +156,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      is not the right fix, then it should be removed from trunk.
      Putting it here is a way to revive the discussion
 
-  *) htcacheclean: Fix help output and error message.
-     Trunk version of patch:
-        https://svn.apache.org/r1864784
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1864784 ^/httpd/httpd/trunk .
-     +1: jorton, ylavic, jfclere
-
   *) back port the add of balancer_manage in mod_proxy_balancer.
      trunk patch: http://svn.apache.org/r1859235
                   http://svn.apache.org/r1887138