Author: breser
Date: Thu May 16 22:06:56 2013
New Revision: 1483588
URL: http://svn.apache.org/r1483588
Log:
* STATUS: Vote for r1482759 and change note to a branch (bot isn't sentient yet)
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1483588&r1=1483587&r2=1483588&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu May 16 22:06:56 2013
@@ -280,13 +280,10 @@ Candidate changes:
Prevent svnserve from exiting when a client connection is aborted.
Justification:
DoS against svnserve possible.
- Notes:
- To prevent a tree conflict, run a sub-tree merge like this:
- svn merge -c r1482759,r1482779 \
- ^/subversion/trunk/subversion/svnserve/svnserve.c \
- subversion/svnserve/main.c
+ Branch:
+ ^/subversion/branches/1.7.x-r1482759
Votes:
- +1: stsp
+ +1: stsp, breser
Veto-blocked changes:
=====================
