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 088AA109D6 for ; Mon, 31 Mar 2014 13:12:35 +0000 (UTC) Received: (qmail 25356 invoked by uid 500); 31 Mar 2014 13:12:32 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 25248 invoked by uid 500); 31 Mar 2014 13:12:30 -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 25233 invoked by uid 99); 31 Mar 2014 13:12:28 -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, 31 Mar 2014 13:12:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1D8DB887F75; Mon, 31 Mar 2014 13:12:28 +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, 31 Mar 2014 13:12:28 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 84c6bac40 -> 3ca8d16e6 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/3ca8d16e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3ca8d16e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3ca8d16e Branch: refs/heads/2.7.x-fixes Commit: 3ca8d16e687fbd9e671d7e0eccdf6624b966e32d Parents: 84c6bac Author: Colm O hEigeartaigh Authored: Mon Mar 31 14:12:18 2014 +0100 Committer: Colm O hEigeartaigh Committed: Mon Mar 31 14:12:18 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/3ca8d16e/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 3796969..06a5ce6 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -516,6 +516,7 @@ B 885290da4c6f3c8426b1453903cb9308e44eed05 B 885d450243af92377f0d83d90c7a9dae124a4d2d B 888bfa0ee1fcb1c649b8af7291bad431bb3f9474 B 893263d9f832d052c396d3532784c667c60c5037 +B 8a49565e6a27aaf9a023ceec99851bffdc280fc8 B 8b697ed365227feedd97ae394bc3ef3dce57092d B 8ba62afd77c74af7599b8a16442eaf8d15fc2359 B 8bbb1b06740d9fb47173632395be3b465f5637d8 @@ -691,6 +692,7 @@ B b816789d8a37a0ee970cf692d4a5f0f0c2a2cd99 B b82c554039475f60918e6b68e1999be4b7334d2c B b83e3fc793f14e180eb4346ac6bf73b758476e11 B b89704d67dc4a9eb5cd59890956ebdcac0584123 +B b8a7ca3f4ffc962f28fa4a3d9a4cf9a458c25f24 B b8f68b6ef1794e32e1a1b36b7347fe42bd0af7bf B b9071a45eb2ea0a06f8ce8ca4b1783c49064e79f B b91d4c69e23ed7935655a8c78670df407b11bf51 @@ -814,6 +816,7 @@ B db6d55988ee70dfa3e751d4de13cac43005fc3f6 B db84f3f6128c4c670f1b328a5aeb6b2617af48a9 B db872c215057bafcaef5d48652373d607c7a9d9d B dbaeb110eb4a575ab647fccec10b87d688114d84 +B dc5bde7d96f8db6008a09d6d49f749da338b88e9 B dc9ae1559e892067c06daf00772e458b6428b1f5 B dd31efec968b7e0fc084065c058fdb1f6e66af72 B dd61195c15e6810e3edbe6547162e8d19bbf2f72