Author: stsp
Date: Thu May 16 13:39:11 2013
New Revision: 1483357
URL: http://svn.apache.org/r1483357
Log:
* STATUS: Prevent the automatic merge script from merging approved changes
automatically, because we might not want to put them into 1.8.0.
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=1483357&r1=1483356&r2=1483357&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu May 16 13:39:11 2013
@@ -109,18 +109,6 @@ Candidate changes:
Votes:
+1: rhuijben
-Veto-blocked changes:
-=====================
-
-Approved changes:
-=================
-
-# 1.8.0-rc2 is being voted on currently and as such 1.8.0 is in the soak phase.
-# Changes that are not intended for 1.8.0 should not be placed here and changes
-# that would restart the soak should not be added unless they are resolving
-# blocking issues. If in doubt see this link for details:
-#
http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
-
* r1482759, r1482779
Prevent svnserve from exiting when a client connection is aborted.
Justification:
@@ -134,3 +122,15 @@ Approved changes:
Build fails.
Votes:
+1: philip, rhuijben, stsp
+
+Veto-blocked changes:
+=====================
+
+Approved changes:
+=================
+
+# 1.8.0-rc2 is being voted on currently and as such 1.8.0 is in the soak phase.
+# Changes that are not intended for 1.8.0 should not be placed here and changes
+# that would restart the soak should not be added unless they are resolving
+# blocking issues. If in doubt see this link for details:
+#
http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
