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 6EF2E117C2 for ; Wed, 10 Sep 2014 16:36:55 +0000 (UTC) Received: (qmail 47399 invoked by uid 500); 10 Sep 2014 16:36:55 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 47215 invoked by uid 500); 10 Sep 2014 16:36:55 -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 47199 invoked by uid 99); 10 Sep 2014 16:36:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Sep 2014 16:36:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E77791EBF5; Wed, 10 Sep 2014 16:36:54 +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: Wed, 10 Sep 2014 16:36:55 -0000 Message-Id: <8f543dd4d65a489691b5175e9e1ffac2@git.apache.org> In-Reply-To: <2d59e185da4249edb8b42465d7224348@git.apache.org> References: <2d59e185da4249edb8b42465d7224348@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Recording .gitmergeinfo Changes 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/2d70ed2e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2d70ed2e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2d70ed2e Branch: refs/heads/2.7.x-fixes Commit: 2d70ed2ef947e023fba7d5bd21b0a79b182636cb Parents: 9fbb979 Author: Colm O hEigeartaigh Authored: Wed Sep 10 17:20:29 2014 +0100 Committer: Colm O hEigeartaigh Committed: Wed Sep 10 17:20:29 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2d70ed2e/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index c657eec..e9112b7 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1355,6 +1355,7 @@ M 023872e3024af7bf283031372fc0340d9560f51c M 02848d574a92a861503f636decef33c5a5e1c45e M 03630b26abad154d953a217ee7a822a8dac3a4ac M 037da2d9693ff7de7fd85b9d1fc85550831a2133 +M 03eca7af8b03c10e3f2a6d9915bf5a06e6627879 M 03f31aedfaf53d808e88e9262c5ee3232b023a67 M 0400b946bcd06736b6d951ec61990d6b4967367e M 0415f4685fcb7c95a3c7cedb57aaf6e19abb7562