Merged x1.

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

diff --git a/STATUS b/STATUS
index ccf39d94aa0d5427deefe16e2a70d8ee542ba1fb..11efaf01e77e2fa4724423d520c3a8c653a0e49a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -152,16 +152,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_dav: add DavBasePath (PR 35077)
-     Trunk version of patch:
-        https://svn.apache.org/r1911651
-        https://svn.apache.org/r1911906
-     Backport version for 2.4.x of patch:
-        svn merge -c 1911651,1911906 ^/httpd/httpd/trunk .
-     2.4.x PR:
-        https://github.com/apache/httpd/pull/377
-     +1: jorton, minfrin, rpluem
-
   *) mod_alias: Add AliasPreservePath directive to map the full path after the
      alias in a location. Requires r1861542 / r1861569 above.
      Trunk version of patch: