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 AE2F817D1F for ; Thu, 16 Apr 2015 10:13:41 +0000 (UTC) Received: (qmail 40600 invoked by uid 500); 16 Apr 2015 10:13:41 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 40538 invoked by uid 500); 16 Apr 2015 10:13:41 -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 40529 invoked by uid 99); 16 Apr 2015 10:13:41 -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, 16 Apr 2015 10:13:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4BED0E103A; Thu, 16 Apr 2015 10:13:41 +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: <9ff48e592bbe43b99572a9fda3c38fdc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Thu, 16 Apr 2015 10:13:41 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 4bdd188b4 -> 32040bbec 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/32040bbe Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/32040bbe Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/32040bbe Branch: refs/heads/3.0.x-fixes Commit: 32040bbec6c9efea62af093400b7c33b8aec33ec Parents: 4bdd188 Author: Colm O hEigeartaigh Authored: Thu Apr 16 11:13:34 2015 +0100 Committer: Colm O hEigeartaigh Committed: Thu Apr 16 11:13:34 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/32040bbe/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index be979fc..b4bef05 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -192,6 +192,7 @@ B a5f8a4dd4d9ecbfc1f8a1a8e5bcb4af17f561cc5 B a79bb058aaf71e85dcb5c90e7b2f6e4ab8e63cba B a7b79ea692add4f9da0f1232e3bfb338099f4147 B a7c6e78b491c4feb6797a6dddd32a6249189a552 +B a892678e5e2976d0c46ccdc44acb303e855aad9a B ab4eaac0be87291b7f053d144dc8fbf9d98634c3 B ad5763ef8ea1ff3c8ddea2c3a6fabdaae6acddd6 B ad700a5f6471f55680821f6d04b182f5d3a6054e