From: Graham Leggett <minfrin@apache.org>
Date: Sun, 13 Oct 2013 11:51:03 +0000 (+0000)
Subject: Vote, comment.
X-Git-Tag: 2.2.26~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb6771175ef21c17dcfcc06cc7c15c99b08470a6;p=thirdparty%2Fapache%2Fhttpd.git

Vote, comment.


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

diff --git a/STATUS b/STATUS
index bb6cc48ba18..fc24a1871b3 100644
--- a/STATUS
+++ b/STATUS
@@ -126,7 +126,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   * mod_dav: Fix 55306.  Don't require lock tokens for COPY source.
     trunk patches: https://svn.apache.org/r1528718
     2.2.x: trunk works, CHANGES needs to be written when merging
-    +1: breser
+    +1: breser, minfrin
 
   * mod_dav: Fix 55397.  dav_resource->uri treated as unencoded. This was an
     unnecessary ABI changed introduced in 2.2.25
@@ -135,6 +135,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x: trunk works, CHANGES needs to be written when merging
     2.2.x: https://people.apache.org/~breser/httpd/2.2.x/patches/pr55397.patch 
     +1: breser
+    minfrin: r1529559 puts modules/dav/fs/repos.c into conflict for me
 
 PATCHES/ISSUES THAT ARE STALLED