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

[rh...@apache.org]

Author: rhuijben
Date: Thu Apr 26 14:49:51 2012
New Revision: 1330889

URL: http://svn.apache.org/viewvc?rev=1330889&view=rev
Log:
* STATUS: Re-add 2 votes from philip which I accidentally removed in r1330888

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=1330889&r1=1330888&r2=1330889&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Apr 26 14:49:51 2012
@@ -90,7 +90,7 @@ Candidate changes:
    Branch:
      ^/subversion/branches/1.7.x-issue4166
    Votes:
-     +1: pburba
+     +1: pburba, philip
      -0: stsp (doesn't compile: "error: 'notify_abspath' undeclared".
                Backport branch added - pburba)
 
@@ -104,17 +104,6 @@ Candidate changes:
    Votes:
      +1: pburba, rhuijben
 
- * r1330258
-   Fix issue #4161 "Assertion failed with svn diff -r BASE:HEAD ^/trunk"
-   Justification:
-     Regression from 1.6. Users should not run into assertions.
-   Branch:
-     ^/subversion/branches/1.7.x-issue4161
-   Notes:
-     A previous backport of this change was incorrect and had to be reverted.
-   Votes:
-     +1: stsp, rhuijben
-
 Veto-blocked changes:
 =====================
 
@@ -147,3 +136,14 @@ Approved changes:
      ^/subversion/branches/1.7.x-r1306111
    Votes:
      +1: danielsh, stsp, rhuijben
+
+ * r1330258
+   Fix issue #4161 "Assertion failed with svn diff -r BASE:HEAD ^/trunk"
+   Justification:
+     Regression from 1.6. Users should not run into assertions.
+   Branch:
+     ^/subversion/branches/1.7.x-issue4161
+   Notes:
+     A previous backport of this change was incorrect and had to be reverted.
+   Votes:
+     +1: stsp, philip, rhuijben