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 3C50D10D42 for ; Wed, 30 Oct 2013 12:52:53 +0000 (UTC) Received: (qmail 23093 invoked by uid 500); 30 Oct 2013 12:52:51 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 23080 invoked by uid 500); 30 Oct 2013 12:52:50 -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 23073 invoked by uid 99); 30 Oct 2013 12:52:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Oct 2013 12:52:49 +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; Wed, 30 Oct 2013 12:52:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2B77623888FE; Wed, 30 Oct 2013 12:52:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn propchange: r1536950 - svn:log Date: Wed, 30 Oct 2013 12:52:25 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131030125225.2B77623888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: philip Revision: 1536950 Modified property: svn:log Modified: svn:log at Wed Oct 30 12:52:25 2013 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Wed Oct 30 12:52:25 2013 @@ -1,2 +1,2 @@ -On the fsfs-improvements branch: sync with parent branch. +On the log-addressing branch: sync with parent branch. Resolved a few minor conflicts in the testing code.