Update and reset.

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

diff --git a/STATUS b/STATUS
index 000718c122124ec2bc7179fc6837c0675572b4a2..f831b841b712e1b3fb014a81ed9395188af9fc18 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -225,11 +225,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) 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 ^/httpd/httpd/trunk .
+        svn merge -c 1911651,1911906 ^/httpd/httpd/trunk .
      2.4.x PR:
         https://github.com/apache/httpd/pull/377
-     +1: jorton, icing, 
+     +1: jorton,
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]