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 0086E10B91 for ; Wed, 26 Mar 2014 15:42:14 +0000 (UTC) Received: (qmail 10298 invoked by uid 500); 26 Mar 2014 15:42:12 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 10241 invoked by uid 500); 26 Mar 2014 15:42:10 -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 10222 invoked by uid 99); 26 Mar 2014 15:42:10 -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, 26 Mar 2014 15:42:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 23213949DF5; Wed, 26 Mar 2014 15:42:10 +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: <631b5865dac740aab3820d2d7ffd0d71@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Recording .gitmergeinfo Changes Date: Wed, 26 Mar 2014 15:42:10 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 748b97767 -> 2dd2ededf 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/2dd2eded Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2dd2eded Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2dd2eded Branch: refs/heads/2.7.x-fixes Commit: 2dd2ededfeebcfbda26318ff6ed422bb01642204 Parents: 748b977 Author: Colm O hEigeartaigh Authored: Wed Mar 26 15:42:01 2014 +0000 Committer: Colm O hEigeartaigh Committed: Wed Mar 26 15:42:01 2014 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2dd2eded/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index b703174..2382435 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -950,6 +950,7 @@ B fec6f70589dba07d780d6beac81e3e3ed8caa7b1 B ff208632bb993cd8572bf934782479d9206e4463 B fffba8c29af441e506828049c5407ae91ce01a81 M 00137e334ed28eacc3256bc66fd5954b5faee992 +M 0048c8fa2ccfe00fd8243544e1948133604563b5 M 00597a58fbb8af58a2c84d37cb504496a8d0e6c2 M 00af0597c650f8b9fccd64e3f362edf9fc9f4b3d M 0189dc60a79f876b00f909d1e5d1de3f12c16ff3