Author: rhuijben
Date: Fri Feb 18 14:04:41 2011
New Revision: 1071999
URL: http://svn.apache.org/viewvc?rev=1071999&view=rev
Log:
* STATUS: Cast some votes
Modified:
subversion/branches/1.6.x/STATUS
Modified: subversion/branches/1.6.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1071999&r1=1071998&r2=1071999&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Fri Feb 18 14:04:41 2011
@@ -56,15 +56,6 @@ Candidate changes:
separate these changes and clearly describe each one? And update
the r878607 log msg.)
- * r902467
- Fix broken svn_ra_get_mergeinfo API promise in serf and neon
- implementations -- return a null mergeinfo catalog if there is
- no mergeinfo, as per svn_ra_get_mergeinfo's API
- Justification:
- Fixes an uninitialized variable that can result in a segfault.
- Votes:
- +1: pburba, stsp
-
* r916286, r917512
Fixes failing commmits (with vague error messages) seen on client
side for WebDAV proxy configurations such as the following (note
@@ -191,15 +182,6 @@ Candidate changes:
+0: danielsh
-0: stsp (doesn't merge cleanly. Please create a backport branch.)
- * r1058269
- Fix issue #3486, "attempt to add tree conflict that already exists" again.
- Justification:
- Users should not be able to run into this situation.
- Branch:
- ^/subversion/branches/1.6.x-r1058269
- Votes:
- +1: stsp, philip
-
* 1.6.x-fsfs-begin-txn-deadlock
Fix a deadlock that can occur when two or more multithreaded
Subversion servers on the same system serve two or more fsfs
@@ -233,14 +215,6 @@ Candidate changes:
+1: cmpilato (r962377, r962378 only), philip
-0: danielsh (authz concerns)
- * r1071239, r1071307
- Locks without athn SEGV in mod_dav_svn
- Justification:
- I think it can only happen during commit to a server that doesn't require
- authn, but a server SEGV is bad.
- Votes:
- +1: philip, stsp
-
Veto-blocked changes:
=====================
@@ -338,6 +312,24 @@ Veto-blocked changes:
Approved changes:
=================
+ * r902467
+ Fix broken svn_ra_get_mergeinfo API promise in serf and neon
+ implementations -- return a null mergeinfo catalog if there is
+ no mergeinfo, as per svn_ra_get_mergeinfo's API
+ Justification:
+ Fixes an uninitialized variable that can result in a segfault.
+ Votes:
+ +1: pburba, stsp, rhuijben
+
+ * r1058269
+ Fix issue #3486, "attempt to add tree conflict that already exists" again.
+ Justification:
+ Users should not be able to run into this situation.
+ Branch:
+ ^/subversion/branches/1.6.x-r1058269
+ Votes:
+ +1: stsp, philip, rhuijben
+
* r1064839
Additional fixes for issue #3270, required when the log is traversing
complex histories that max out our internal history cache.
@@ -354,3 +346,11 @@ Approved changes:
^/subversion/branches/1.6.x-r1068988
Votes:
+1: stsp, julianfoad, philip (for the branch)
+
+ * r1071239, r1071307
+ Locks without athn SEGV in mod_dav_svn
+ Justification:
+ I think it can only happen during commit to a server that doesn't require
+ authn, but a server SEGV is bad.
+ Votes:
+ +1: philip, stsp, rhuijben
