Merged x2. [skip ci]

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

diff --git a/STATUS b/STATUS
index deca7919e44d605c5864b077b6aad7d3683d1a03..34a17e803b9fc57b54cb825bc48a35ca533b7ff3 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -196,22 +196,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       svn merge -c 1889936 ^/httpd/httpd/trunk .
      +1: rpluem, jorton, jim
 
-  *) mod_ssl: don't verify cert files are present when dumping config
-     Trunk version of patch:
-        https://svn.apache.org/r1861269
-     Backport version for 2.4.x of patch:
-        Trunk version of patch works
-        svn merge -c 1861269 ^/httpd/httpd/trunk .
-     +1: jorton, rpluem, jim
-
-  *) mod_proxy: downgrade AH03408 log level to INFO from WARN
-     Trunk version of patch:
-        https://svn.apache.org/r1756531
-     Backport version for 2.4.x of patch:
-        Trunk version of patch works
-        svn merge -c 1756531 ^/httpd/httpd/trunk .
-     +1: jorton, rpluem, jim
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]