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 5C772182E3 for ; Mon, 15 Feb 2016 11:09:59 +0000 (UTC) Received: (qmail 57572 invoked by uid 500); 15 Feb 2016 11:09:59 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 57506 invoked by uid 500); 15 Feb 2016 11:09:59 -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 57496 invoked by uid 99); 15 Feb 2016 11:09:59 -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, 15 Feb 2016 11:09:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1BA2CE0A08; Mon, 15 Feb 2016 11:09:59 +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: <100171714f1d45818f248a40d6060507@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Mon, 15 Feb 2016 11:09:59 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 535ebc84f -> 42551a19a 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/42551a19 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/42551a19 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/42551a19 Branch: refs/heads/3.0.x-fixes Commit: 42551a19a92a8b1e6f7fa50d79f7bf26a302f7bf Parents: 535ebc8 Author: Colm O hEigeartaigh Authored: Mon Feb 15 11:09:54 2016 +0000 Committer: Colm O hEigeartaigh Committed: Mon Feb 15 11:09:54 2016 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/42551a19/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index deb511d..22b3898 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -617,6 +617,7 @@ B c9a2f0d2e292c9e11728453fd4da910f9f1609a4 B c9ec28df42e815b0771964fdae96b7ecb2e2281b B ca0b59607b5c401b94fa918abb7b866184a9e1bd B ca1f38bcbcc5097af7e537173cacb24806b4b490 +B cab2ad9c5027ae9574de002ddc70908156e6f722 B cb19d05174a3bd078b391c4f6c151ee6e34e2956 B cb2160fee6782b8638477ae7af5ad4cd82d6b88f B cb5211ec61d20e91b920b3c60f34b3e50f571c42