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 86D80189F3 for ; Tue, 9 Feb 2016 18:00:28 +0000 (UTC) Received: (qmail 19701 invoked by uid 500); 9 Feb 2016 18:00:28 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 19641 invoked by uid 500); 9 Feb 2016 18:00:28 -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 19629 invoked by uid 99); 9 Feb 2016 18:00:28 -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; Tue, 09 Feb 2016 18:00:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D21D5E031B; Tue, 9 Feb 2016 18:00: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: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Tue, 9 Feb 2016 18:00:27 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 22b154473 -> caa0c696f 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/caa0c696 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/caa0c696 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/caa0c696 Branch: refs/heads/3.0.x-fixes Commit: caa0c696fb53b99de3ad1e569d178551cc83f1c8 Parents: 22b1544 Author: Colm O hEigeartaigh Authored: Tue Feb 9 18:00:22 2016 +0000 Committer: Colm O hEigeartaigh Committed: Tue Feb 9 18:00:22 2016 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/caa0c696/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 4a2cd59..f2a3f20 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -497,6 +497,7 @@ B a5aff3e7a43274b3d47cda706aaf8108bd7a9b07 B a5f8a4dd4d9ecbfc1f8a1a8e5bcb4af17f561cc5 B a602c9df3e2e09855410f0e75af9b108620b7794 B a67a0a69214717c7c92baa27f74000d5af895c83 +B a75df553a2bb0cee94b96fababa723d7d0f45d90 B a77c05fcbef3f8a0d963dd196fa1f142a975f6cd B a79bb058aaf71e85dcb5c90e7b2f6e4ab8e63cba B a7b79ea692add4f9da0f1232e3bfb338099f4147