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 C14D4188DB for ; Fri, 13 Nov 2015 15:09:05 +0000 (UTC) Received: (qmail 64886 invoked by uid 500); 13 Nov 2015 15:09:05 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 64825 invoked by uid 500); 13 Nov 2015 15:09:05 -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 64816 invoked by uid 99); 13 Nov 2015 15:09:05 -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; Fri, 13 Nov 2015 15:09:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7B248E038A; Fri, 13 Nov 2015 15:09:05 +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: <30351d3b9b134f61b597210e3db821b8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Fri, 13 Nov 2015 15:09:05 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 1c4ffc8ee -> 5704f28b5 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/5704f28b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5704f28b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5704f28b Branch: refs/heads/3.0.x-fixes Commit: 5704f28b5cd7344f62acee838a26a3d22fc38344 Parents: 1c4ffc8 Author: Colm O hEigeartaigh Authored: Fri Nov 13 15:09:01 2015 +0000 Committer: Colm O hEigeartaigh Committed: Fri Nov 13 15:09:01 2015 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/5704f28b/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 6b9c226..25b1b2f 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -58,6 +58,7 @@ B 2004b1021ce0d0975eb49cae36416863bd8c59bb B 20467ecea3cb0778bd02e60029d4d4ec7a8a2483 B 20539c0278472689722204f0c08e68a86597aae1 B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1 +B 22d0c244d3b60aafbd3c070e9599012019de486c B 2302aa5820661975bb04857fa6d48bb68bebb4f7 B 2345b6e4ff4adf48e9adf5e0b9245da3f7afa011 B 237ace40ea2c204f68848309b9483c322499b524