svn commit: r1841827 - /subversion/branches/1.11.x/STATUS

[br...@apache.org]

Author: brane
Date: Mon Sep 24 10:47:15 2018
New Revision: 1841827

URL: http://svn.apache.org/viewvc?rev=1841827&view=rev
Log:
* branches/1.11.x/STATUS: Approve the r1841731 group.

Modified:
    subversion/branches/1.11.x/STATUS

Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841827&r1=1841826&r2=1841827&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Mon Sep 24 10:47:15 2018
@@ -34,17 +34,6 @@ Candidate changes:
    Votes:
      +1: stsp, jcorvel
 
- * r1841731, r1841736, r1841743
-   Fix endless loop in the conflict resolver.
-   Justification:
-     'local missing' conflicts with directories can trigger an endless loop.
-   Notes:
-     r1841731 is the actual fix and test
-     r1841736 is a follow-up fix to make the test pass on Windows
-     r1841743 is a follow-up fix for the follow-up fix :)
-   Votes:
-     +1: stsp, jcorvel
-
  * r1841719, r1841742
    Add support for 'local missing' conflicts with directories.
    Justification:
@@ -72,3 +61,14 @@ Veto-blocked changes:
 
 Approved changes:
 =================
+
+ * r1841731, r1841736, r1841743
+   Fix endless loop in the conflict resolver.
+   Justification:
+     'local missing' conflicts with directories can trigger an endless loop.
+   Notes:
+     r1841731 is the actual fix and test
+     r1841736 is a follow-up fix to make the test pass on Windows
+     r1841743 is a follow-up fix for the follow-up fix :)
+   Votes:
+     +1: stsp, jcorvel, brane