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/12/02 12:11:41 UTC

svn commit: r1642843 - /subversion/branches/1.7.x/STATUS

Author: philip
Date: Tue Dec  2 11:11:40 2014
New Revision: 1642843

URL: http://svn.apache.org/r1642843
Log:
* STATUS: Vote/approve backport conflict fix.

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=1642843&r1=1642842&r2=1642843&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Dec  2 11:11:40 2014
@@ -102,15 +102,6 @@ Candidate changes:
    Votes:
      +1: brane, stefan2
 
- * ^/subversion/branches/1.7.x-r1227815-conflict
-   Fix compilation after backporting 1.7.x-r1574868 branch.
-   Justification:
-     1.7.x shouldn't cause compile errors.
-   Branch:
-     ^/subversion/branches/1.7.x-r1227815-conflict
-   Votes:
-     +1: rhuijben, julianfoad
-
 Veto-blocked changes:
 =====================
 
@@ -128,3 +119,12 @@ Veto-blocked changes:
 
 Approved changes:
 =================
+
+ * ^/subversion/branches/1.7.x-r1227815-conflict
+   Fix compilation after backporting 1.7.x-r1574868 branch.
+   Justification:
+     1.7.x shouldn't cause compile errors.
+   Branch:
+     ^/subversion/branches/1.7.x-r1227815-conflict
+   Votes:
+     +1: rhuijben, julianfoad, philip