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 A636110ECE for ; Tue, 22 Oct 2013 18:50:34 +0000 (UTC) Received: (qmail 6186 invoked by uid 500); 22 Oct 2013 18:48:54 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 5926 invoked by uid 500); 22 Oct 2013 18:48:18 -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 5744 invoked by uid 99); 22 Oct 2013 18:47:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Oct 2013 18:47:59 +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; Tue, 22 Oct 2013 18:47:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6166923889FA; Tue, 22 Oct 2013 18:47:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1534728 - /subversion/branches/1.8.x/CHANGES Date: Tue, 22 Oct 2013 18:47:36 -0000 To: commits@subversion.apache.org From: breser@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131022184736.6166923889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: breser Date: Tue Oct 22 18:47:35 2013 New Revision: 1534728 URL: http://svn.apache.org/r1534728 Log: Record only merge of r1485508 to fix the mergeinfo. r1503856 missed including r1485508 which caused a conflict which I must have fixed by accepting theirs conflict. But that implicitly merged r1485508 so now mergeinfo thinks r1485508 is eligible. Modified: subversion/branches/1.8.x/CHANGES (props changed) Propchange: subversion/branches/1.8.x/CHANGES ------------------------------------------------------------------------------ Merged /subversion/trunk/CHANGES:r1485508