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 D042418724 for ; Thu, 14 Jan 2016 12:03:11 +0000 (UTC) Received: (qmail 98428 invoked by uid 500); 14 Jan 2016 12:03:11 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 98368 invoked by uid 500); 14 Jan 2016 12:03:11 -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 98359 invoked by uid 99); 14 Jan 2016 12:03:11 -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; Thu, 14 Jan 2016 12:03:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 46D15E0AB2; Thu, 14 Jan 2016 12:03:11 +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: <3f10128dd06c447db2dc115de5f1933a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Thu, 14 Jan 2016 12:03:11 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.1.x-fixes d5cbce130 -> e0f8164c7 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/e0f8164c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e0f8164c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e0f8164c Branch: refs/heads/3.1.x-fixes Commit: e0f8164c747d2120b882e565782aab0097290209 Parents: d5cbce1 Author: Colm O hEigeartaigh Authored: Thu Jan 14 12:03:04 2016 +0000 Committer: Colm O hEigeartaigh Committed: Thu Jan 14 12:03:04 2016 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e0f8164c/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index d365b95..c5cb047 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -11,6 +11,7 @@ B 8a4e85b24d6d5b438ceb28257c53773d46b5816d B 8b92fe57dd9a661dab382da7d556b1972f513a93 B a261507ebd3104b1a00298801ec9815ed1e7a728 B a7362dfaf2141cb4f303f81bbb94c6df81be75cb +B bceee342b32f3704ca75176d06067f90c6d3fbdc B ced98c6e937bd93f92dac9043fa0406c696bfd84 B f0e08b7bea2660542e18294d490e68c7b14aaa4b B f1b56150d6520e73d2ade2296c3b2f13839e63e5