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 5051311673 for ; Tue, 13 May 2014 16:32:14 +0000 (UTC) Received: (qmail 47485 invoked by uid 500); 13 May 2014 16:32:14 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 47416 invoked by uid 500); 13 May 2014 16:32:14 -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 47396 invoked by uid 99); 13 May 2014 16:32:14 -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, 13 May 2014 16:32:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BEDC525D3D; Tue, 13 May 2014 16:32:13 +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: <70683a01267d41ce86bf4039d49d6719@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Recording .gitmergeinfo Changes Date: Tue, 13 May 2014 16:32:13 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.6.x-fixes 4df51a9df -> e96b56ddf 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/e96b56dd Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e96b56dd Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e96b56dd Branch: refs/heads/2.6.x-fixes Commit: e96b56ddf022b8055ef8df552dce0d9c8e8d67d2 Parents: 4df51a9 Author: Colm O hEigeartaigh Authored: Tue May 13 17:32:05 2014 +0100 Committer: Colm O hEigeartaigh Committed: Tue May 13 17:32:05 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e96b56dd/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 3a3ed47..a1f60b3 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -393,6 +393,7 @@ B 594ca4338a8b4605434368c74dcea5e72c6b9743 B 59c9c55b166fdd128e13e71f9e2c70629f817543 B 5a6b470508165ed183464256c29a65cc1d3529c9 B 5a962a3588635b5742c41f4f9b8a5e4481de3579 +B 5acddd2f2af6e8215eb43f4d73a0c317a1381635 B 5b8daa3229069f49907bd51cdcc45255cba1a492 B 5bc7c25097225e85daa611abd0f4a253326ec1eb B 5bd513f253c2ac10431bae69188f5f8089ca8697