Merged x1.

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

diff --git a/STATUS b/STATUS
index dcf8ab02ebee5bce52e2dd3d437615a074e5cdcd..9dc29515faa24cf3f174f6a8ee7b243a01e2bf81 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -163,14 +163,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) modules/md/mod_md_config.c: Flip MDServerStatus to
-     disabled by default. mod_md is CTR, but probably not
-     the change in default behavior. Needs an explicit
-     hint in CHANGES after applying it.
-     Backport has a conflict in docs, easy to fix.
-     trunk patch: https://svn.apache.org/r1935184
-     2.4.x patch: svn merge -c 1935184 ^/httpd/httpd/trunk .
-     +1: rjung, jim, jorton
 
 
 ------------------------------------------------------------------------