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 D5A9E10640 for ; Tue, 1 Apr 2014 15:26:09 +0000 (UTC) Received: (qmail 69800 invoked by uid 500); 1 Apr 2014 15:26:08 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 69696 invoked by uid 500); 1 Apr 2014 15:26:08 -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 69688 invoked by uid 99); 1 Apr 2014 15:26:07 -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, 01 Apr 2014 15:26:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 50F3391BCEA; Tue, 1 Apr 2014 15:26:06 +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: <5f6b07c492aa4847bcdb014a014ea699@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Recording .gitmergeinfo Changes Date: Tue, 1 Apr 2014 15:26:06 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 8da1f3231 -> b9fdca8bb 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/b9fdca8b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b9fdca8b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b9fdca8b Branch: refs/heads/2.7.x-fixes Commit: b9fdca8bb66a3072d568034be63062804b534238 Parents: 8da1f32 Author: Colm O hEigeartaigh Authored: Tue Apr 1 16:25:58 2014 +0100 Committer: Colm O hEigeartaigh Committed: Tue Apr 1 16:25:58 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b9fdca8b/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 019488d..e240547 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -650,6 +650,7 @@ B ad9fef8fe55752ca99a5047efb2fdc54e7d19e01 B adfb0d10fa2aeaa1add8fbda90d440bdf2c1a8af B ae039d5762840d76f710393071aad85fb09fd5ea B ae1212c3e25bfbd9b39ad450fa686e7a9ee9114b +B af577d218398d35a3f52a34bb489789e97f1e8a1 B af70ff876270387875292bcf90844a7ad258376c B afe13e4bef33381f27adcad6b5b0ca857673945c B aff4f5d14c7bba6f3b542b61a2a5c80430a1d350