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 2B7E417778 for ; Mon, 2 Feb 2015 14:48:30 +0000 (UTC) Received: (qmail 13126 invoked by uid 500); 2 Feb 2015 14:48:27 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 13072 invoked by uid 500); 2 Feb 2015 14:48:27 -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 13063 invoked by uid 99); 2 Feb 2015 14:48:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2015 14:48:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BFF12E035D; Mon, 2 Feb 2015 14:48:27 +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: <5b597ed391564ab795545e2f2abfd686@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Mon, 2 Feb 2015 14:48:27 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 0300a5eb3 -> 3b380e710 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/3b380e71 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3b380e71 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3b380e71 Branch: refs/heads/2.7.x-fixes Commit: 3b380e7109c50b74a213a019029883924dd3470c Parents: 0300a5e Author: Colm O hEigeartaigh Authored: Mon Feb 2 14:48:23 2015 +0000 Committer: Colm O hEigeartaigh Committed: Mon Feb 2 14:48:23 2015 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/3b380e71/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 411e37e..21f1882 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -290,6 +290,7 @@ B 2747744322eb4c285ce6ab6d1c8c80a2f4f186d5 B 278e8a9d6fe6979623258be58d1ed2b89edc5da4 B 27bb1f5f1426fc1a6bad091a36cb552a6c095644 B 27c1ff34d829badbb11b8c12e4d605ca8a57effe +B 27d990856e2c135a6037de850ad3171903202c3c B 27e7ac7cfb52bbab1051d23b002ec7996f1939cc B 27e80bbffacc5d119d53f203ed1044a406969497 B 27fa54fcf7220076503106fa554b1eb74d8103ac