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 EE4A01839F for ; Wed, 13 May 2015 13:44:36 +0000 (UTC) Received: (qmail 38657 invoked by uid 500); 13 May 2015 13:44:35 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 38348 invoked by uid 500); 13 May 2015 13:44:35 -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 38235 invoked by uid 99); 13 May 2015 13:44:35 -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; Wed, 13 May 2015 13:44:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5D20CE30F6; Wed, 13 May 2015 13:44:35 +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: <4a05115d4822411aa554d2ece39efbec@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Wed, 13 May 2015 13:44:35 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 20b448289 -> ba8f158d5 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/ba8f158d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ba8f158d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ba8f158d Branch: refs/heads/2.7.x-fixes Commit: ba8f158d5dd6e8de6562511a6aeb98200508f8a4 Parents: 20b4482 Author: Colm O hEigeartaigh Authored: Wed May 13 14:44:30 2015 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 13 14:44:30 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ba8f158d/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 58b1205..dc17486 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1264,6 +1264,7 @@ B 96e4336334842ce599ca821319f56813b5036486 B 96e6fa6b664d8dfb1f5a5662a0907cfb60682da5 B 97204118297f76cc48ee2acb154ad2761b725f19 B 97251de37cbc9e0035af3c90eb2b2d248211e052 +B 972a77e000b11187542234b56722ea0f7eba41b7 B 974a336c2bd02c8ab6e37f2c362fb4efb9769b00 B 97682e60cadb251ea47fd89917fc03a6b1ffd020 B 9792971587e7aec6fc0f452d05803813fb2a30d4