You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2015/05/18 06:14:57 UTC

svn commit: r1679928 - /subversion/branches/1.9.x/STATUS

Author: stefan2
Date: Mon May 18 04:14:56 2015
New Revision: 1679928

URL: http://svn.apache.org/r1679928
Log:
* STATUS: add r1678950 and r1678963 to the r1679864
  to fix merge conflicts.

Modified:
    subversion/branches/1.9.x/STATUS

Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1679928&r1=1679927&r2=1679928&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Mon May 18 04:14:56 2015
@@ -69,7 +69,7 @@ Other candidate changes:
      +1: ivan (without r1679909)
      +1: danielsh
 
- * r1679864, r1679866
+ * r1678950, r1678963, r1679864, r1679866
    Ensure full key matching in membuffer cache.
    Justification:
      While the chances of producing an actual key conflict are very slim