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

Posted to commits@subversion.apache.org by da...@apache.org on 2013/06/01 15:03:49 UTC

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

Author: danielsh
Date: Sat Jun  1 13:03:49 2013
New Revision: 1488520

URL: http://svn.apache.org/r1488520
Log:
* STATUS: Unblock r1488267.

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=1488520&r1=1488519&r2=1488520&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sat Jun  1 13:03:49 2013
@@ -64,8 +64,6 @@ Candidate changes:
    Justification:
      Prevents a segfault in the new 'internal text conflict merge tool'.
    Votes:
-     -1: danielsh (Paul: I think you meant r1488267.
-                   Oops, I did, I fixed that - pburba)
      +1: pburba (for 1.8.0:  This isn't a 'destabilizing' change per my
                  reading of our release-stabilization guidelines, so it can
                  be included in 1.8.0 without a soak restart.)