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 C299E11264 for ; Mon, 12 May 2014 12:32:44 +0000 (UTC) Received: (qmail 98747 invoked by uid 500); 12 May 2014 12:32:44 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 98693 invoked by uid 500); 12 May 2014 12:32:44 -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 98686 invoked by uid 99); 12 May 2014 12:32:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 May 2014 12:32:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2C3EC81D6EF; Mon, 12 May 2014 12:32:44 +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: X-Mailer: ASF-Git Admin Mailer Subject: git commit: Recording .gitmergeinfo Changes Date: Mon, 12 May 2014 12:32:44 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.6.x-fixes a6b288e53 -> 4df51a9df 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/4df51a9d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4df51a9d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4df51a9d Branch: refs/heads/2.6.x-fixes Commit: 4df51a9df55d49348c170915a7804cc781b6ad23 Parents: a6b288e Author: Colm O hEigeartaigh Authored: Mon May 12 13:32:36 2014 +0100 Committer: Colm O hEigeartaigh Committed: Mon May 12 13:32:36 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4df51a9d/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index de1033e..3a3ed47 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -586,6 +586,7 @@ B 876e532549f5ae1038947344f1a0431e5339bd4c B 877206648e3e0c4a078c55b63cfdd895d8c38522 B 87b4f1a50da2197ecf7065b1a09a78a2d48d92cc B 87c8b08876c9c6e0e22327480bfea259b6e28b72 +B 87f0669f930e87a2979ed322d6aa72e36c97caed B 880146830bd93d778c9000e682fae04c1d5a62d2 B 8811c99777ef752c29f92c606a3058f4a5b42cec B 8850fd5795caf82667377848bbbd66c86d142afa @@ -613,6 +614,7 @@ B 8be2c414562c196f8f2e267a5304c41785b4924e B 8c0359d3f850c93cd2eeffbe62c32d92a1f3ed53 B 8c081dcf378cd4ba7857b4054f9cd77feeeef666 B 8c40b37ab7fd41482ea4f1e42b4993703ee6be29 +B 8c87c55c813ca5c32f1a213b90483208b6689d68 B 8cc17f9f4d68d43f5a6c5db289fb7e0ec228ff90 B 8d0e512d6e5ab0cc3f84ae062472d109449678b7 B 8da1f32314d555272eeffdce84d9d84c05c205cf @@ -750,6 +752,7 @@ B ac5564f97edf403526bc56343ec1943d87c07917 B ac6835e12deaa5a77d3fe6d9a963d6fb4fe12c23 B ac8a4ab6450467f452d400c9fee3a2de8733740c B ac8c44fc3b6f23d793f4bec817b41f61a63f5821 +B ad1c0971c7752a51b38d3e190c0508c4ee89e60a B ad1edc908157665fe9f28243e2d4bf1840938444 B ad41e8ef278135bef132f11b1ab1eb88ca224935 B ad74f1c2ca99d5556cf531d9e22d3f348d2b3c25