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

Posted to commits@subversion.apache.org by ph...@apache.org on 2014/04/11 14:39:39 UTC

svn commit: r1586633 - /subversion/branches/1.8.x/STATUS

Author: philip
Date: Fri Apr 11 12:39:39 2014
New Revision: 1586633

URL: http://svn.apache.org/r1586633
Log:
* STATUS: Add merge note to memcached fix.

Modified:
    subversion/branches/1.8.x/STATUS

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1586633&r1=1586632&r2=1586633&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Apr 11 12:39:39 2014
@@ -391,5 +391,7 @@ Approved changes:
    Justification:
      Enabling memcached causes crashes without these fixes.
      Regression from 1.7.
+   Notes:
+     Merge with --accept=working to resolve FSX conflict.
    Votes:
      +1: stsp, philip, julianfoad