Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A268360D5 for ; Fri, 15 Jul 2011 11:02:47 +0000 (UTC) Received: (qmail 24293 invoked by uid 500); 15 Jul 2011 11:02:46 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 23902 invoked by uid 500); 15 Jul 2011 11:02:40 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 23884 invoked by uid 99); 15 Jul 2011 11:02:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2011 11:02:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jul 2011 11:02:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 99D0E23889BF for ; Fri, 15 Jul 2011 11:02:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1147092 - /subversion/branches/1.7.x/STATUS Date: Fri, 15 Jul 2011 11:02:17 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110715110217.99D0E23889BF@eris.apache.org> Author: julianfoad Date: Fri Jul 15 11:02:17 2011 New Revision: 1147092 URL: http://svn.apache.org/viewvc?rev=1147092&view=rev Log: * STATUS: Vote and approve r1146899, r1146904. 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=1147092&r1=1147091&r2=1147092&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Fri Jul 15 11:02:17 2011 @@ -42,21 +42,6 @@ Candidate changes: Votes: +0: danielsh - * r1146899 - Improve configure detection of Ruby. - Justification: - Saner configure output, and don't override user's choice of a ruby when - multiple are available. - Votes: - +1: arfrever (with r1146904), danielsh - - * r1146904 - Fix the 'extraclean' target of the Makefile to remove config.{guess,sub} - Justification: - 1.6 removes these. - Votes: - +1: arfrever (with r1146899), philip - * r1146781 Fix a bug in subtree merging. See email thread by Barry Scott, 2011-07-02, "Assert in svn-1.7-alpha2 svn_client_merge3", @@ -109,3 +94,19 @@ Approved changes: +1: peters +0: rhuijben (I think it should be backported, but I can't test this) +0: gstein (likewise) + + * r1146899 + Improve configure detection of Ruby. + Justification: + Saner configure output, and don't override user's choice of a ruby when + multiple are available. + Votes: + +1: arfrever (with r1146904), danielsh, julianfoad + + * r1146904 + Fix the 'extraclean' target of the Makefile to remove config.{guess,sub} + Justification: + 1.6 removes these. + Votes: + +1: arfrever (with r1146899), philip, julianfoad +