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 2B73A1816F for ; Tue, 20 Oct 2015 14:36:52 +0000 (UTC) Received: (qmail 93121 invoked by uid 500); 20 Oct 2015 14:36:42 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 93066 invoked by uid 500); 20 Oct 2015 14:36:42 -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 93054 invoked by uid 99); 20 Oct 2015 14:36:42 -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, 20 Oct 2015 14:36:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 330E8DFD86; Tue, 20 Oct 2015 14:36:42 +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: <23da0104663446f28530c5792892a2c2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Tue, 20 Oct 2015 14:36:42 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 1d96b7b09 -> 8741b8418 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/8741b841 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8741b841 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8741b841 Branch: refs/heads/2.7.x-fixes Commit: 8741b8418ece3c86772c0361da68c91e5b156ec9 Parents: 1d96b7b Author: Colm O hEigeartaigh Authored: Tue Oct 20 15:36:37 2015 +0100 Committer: Colm O hEigeartaigh Committed: Tue Oct 20 15:36:37 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/8741b841/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 106d8e7..1252e47 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -2274,6 +2274,7 @@ B f26cbcc515d90be5bb690aaefc84c4a6a5e108cd B f28f777f7a4cd31c32fa08d26fc7892e4bc1f89f B f29557a3b144603eab65068b6776d823683dab87 B f2bc4d4315ad661284946e3cd213d8e5f7cdd715 +B f2d0618c4c2fc4ec4819a3bc91630febe4afa1cb B f2d508d3bbe97bf89f4556734972bd3bcc457802 B f2f673d889e85597ff2703b209d7eaddc094e3a9 B f3012dc1f948c4f6f487d88ccd81090994b3f8fd