Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AC3E910B51 for ; Tue, 6 Jan 2015 17:24:24 +0000 (UTC) Received: (qmail 14640 invoked by uid 500); 6 Jan 2015 17:24:25 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 14574 invoked by uid 500); 6 Jan 2015 17:24:25 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 14565 invoked by uid 99); 6 Jan 2015 17:24:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jan 2015 17:24:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6AC2D921B32; Tue, 6 Jan 2015 17:24:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Message-Id: <6361171001e34c029f951089230634f1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Tue, 6 Jan 2015 17:24:24 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 2bfd3b1c1 -> 3795e95d9 Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3795e95d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3795e95d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3795e95d Branch: refs/heads/2.7.x-fixes Commit: 3795e95d9993195e889f426746c26cfe7012e1be Parents: 2bfd3b1 Author: Colm O hEigeartaigh Authored: Tue Jan 6 17:24:18 2015 +0000 Committer: Colm O hEigeartaigh Committed: Tue Jan 6 17:24:18 2015 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/3795e95d/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index a684251..41823e0 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -735,6 +735,7 @@ B 6c6d8d64d1e7fa7cdd287ca68195e344a7641399 B 6cd0fa9ffb19b86ec3bc073c66a5c45aa34c8195 B 6cd17724fd6bde4b7b350b147ca06b3601fe7da2 B 6d22caf7519ef84688a86607edf2897d9821e769 +B 6d6eca000515975fc34f385a0d37630ae52d43ba B 6d90bcc2633460b5fce7892365afb0dd23b38e94 B 6dcd71fce8cabcb0557fe6d5d00052968635e267 B 6ddc65814221b8d9ebb29db82eb7f66a443ac319