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 1538E17EC8 for ; Mon, 22 Jun 2015 11:40:57 +0000 (UTC) Received: (qmail 8744 invoked by uid 500); 22 Jun 2015 11:40:57 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 8670 invoked by uid 500); 22 Jun 2015 11:40:57 -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 8661 invoked by uid 99); 22 Jun 2015 11:40:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jun 2015 11:40:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C0EE3E04BE; Mon, 22 Jun 2015 11:40:56 +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 Date: Mon, 22 Jun 2015 11:40:56 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] cxf git commit: Recording .gitmergeinfo Changes Repository: cxf Updated Branches: refs/heads/3.0.x-fixes fb39ed65c -> 67ce51ecc 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/baaf266d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/baaf266d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/baaf266d Branch: refs/heads/3.0.x-fixes Commit: baaf266d4718f4c30ee97d80a6ab5c921e968009 Parents: cf433a2 Author: Colm O hEigeartaigh Authored: Mon Jun 22 12:39:07 2015 +0100 Committer: Colm O hEigeartaigh Committed: Mon Jun 22 12:39:07 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/baaf266d/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index c2915c2..2d55ffd 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -377,6 +377,7 @@ B ffc766ccd1d800c10d8ee52c74d69087dcc19c62 B ffd429be404953874e141c52a9c8ba46812d73ca M 00a5a1d6b1da5f3b679c25d4bd988d1277ee62e7 M 00b626af504d3d59419ec2d1eb5e39943ec5b8aa +M 05383ffcfc3fe16c6acadf1a343375c00fa1116c M 05b96b6e8d1c3f845ce4d9b8a77c638ed7e987b7 M 0cb64ee2bb66e4249c4a0f8d7ae62068e2a95dcd M 0d3d0bd91a8dd9e01e4716bc40dce28ed07c4325