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 4A30C11FFB for ; Mon, 19 May 2014 13:38:01 +0000 (UTC) Received: (qmail 20565 invoked by uid 500); 19 May 2014 13:38:01 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 20499 invoked by uid 500); 19 May 2014 13:38:01 -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 20492 invoked by uid 99); 19 May 2014 13:38:01 -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, 19 May 2014 13:38:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EA87398724B; Mon, 19 May 2014 13:38:00 +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, 19 May 2014 13:38:00 -0000 Message-Id: <4e04f0a5b27745c58ce85d48b88499a5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Recording .gitmergeinfo Changes Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 46d84ce19 -> ceffe26be 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/c5ff01a1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c5ff01a1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c5ff01a1 Branch: refs/heads/2.7.x-fixes Commit: c5ff01a14b9396336c4fe1b939bda7efdd896547 Parents: 5c08654 Author: Colm O hEigeartaigh Authored: Mon May 19 12:48:50 2014 +0100 Committer: Colm O hEigeartaigh Committed: Mon May 19 12:48:50 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c5ff01a1/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index c13013e..1d8a9ae 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1147,6 +1147,7 @@ M 1026909f918661c6d25080a9932f4d63af017a31 M 106b942d2ca4b8a4a95dc34c3d447fe5afb548ba M 10897281ffaf746b845004002d81313ed31d67ed M 1091ca3dba842093f2a65f3727e44344605b005b +M 10969ab68f7f566b88de158bf78f3b9e51384776 M 109e40d4511f7f5eaafd73e0a6e43877d7f6f6bc M 10c6be01530e9a8c323fa53743961a0e7ad7e062 M 10d86cfe1b44ea471a6ddade1ef97b0090b29fa5