Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1770179 - /subversion/branches/1.9.x/STATUS
Date: Thu, 17 Nov 2016 12:46:36 -0000
To: commits@subversion.apache.org
From: rhuijben@apache.org
Message-Id: <20161117124636.A1F133A0EB1@svn01-us-west.apache.org>
archived-at: Thu, 17 Nov 2016 12:46:42 -0000

Author: rhuijben
Date: Thu Nov 17 12:46:36 2016
New Revision: 1770179

URL: http://svn.apache.org/viewvc?rev=1770179&view=rev
Log:
* STATUS: Cast vote. Approve group. (Retry)

Modified:
    subversion/branches/1.9.x/STATUS

Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1770179&r1=1770178&r2=1770179&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Nov 17 12:46:36 2016
@@ -53,6 +53,21 @@ Candidate changes:
      +1: kotkov (without r1769973)
      +0: rhuijben (patch looks good. Untested) (+1 for r1769973)
 
+Veto-blocked changes:
+=====================
+
+Approved changes:
+=================
+
+ * r1766699, r1766704, r1766711
+   Fix a bug where reintegrate merges access a non-existent path and error out.
+   Justification:
+     This problem can prevent reintegration of branches in some situations.
+     Advanced users can fall back to a 2-URL merge but most users won't
+     realize how they can work around the problem.
+   Votes:
+     +1: stsp, rhuijben, stefan2
+
  * r1759117, r1759122, r1759123, r1759124, 1764676
    Fix issue #4657: "Offset too large" error when packing repository in
    FSFS 7 format.
@@ -68,22 +83,4 @@ Candidate changes:
      r1759124 adds a regression test with the necessary internal API changes.
      r1764676 eliminates our reliance on the currently broken APR trunc().
    Votes:
-     +1: stefan2, stsp
-     -0: rhuijben (Merging this branch now introduces conflicts. Caused
-                   by the 2016-11-17 merges)
-         stefan2: fixed by r1770156
-
-Veto-blocked changes:
-=====================
-
-Approved changes:
-=================
-
- * r1766699, r1766704, r1766711
-   Fix a bug where reintegrate merges access a non-existent path and error out.
-   Justification:
-     This problem can prevent reintegration of branches in some situations.
-     Advanced users can fall back to a 2-URL merge but most users won't
-     realize how they can work around the problem.
-   Votes:
-     +1: stsp, rhuijben, stefan2
+     +1: stefan2, stsp, rhuijben