From commits-return-37900-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org Fri Aug 14 13:54:03 2015 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 7ED321850F for ; Fri, 14 Aug 2015 13:54:03 +0000 (UTC) Received: (qmail 87420 invoked by uid 500); 14 Aug 2015 13:54:03 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 87362 invoked by uid 500); 14 Aug 2015 13:54:03 -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 87353 invoked by uid 99); 14 Aug 2015 13:54:03 -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, 14 Aug 2015 13:54:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1FABAE0435; Fri, 14 Aug 2015 13:54:03 +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: Fri, 14 Aug 2015 13:54:03 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 0ee57153e -> d426c3adf 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/d426c3ad Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d426c3ad Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d426c3ad Branch: refs/heads/2.7.x-fixes Commit: d426c3adf1b62d3787af84d1a26a34c44a3812c9 Parents: 0ee5715 Author: Colm O hEigeartaigh Authored: Fri Aug 14 14:53:55 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Aug 14 14:53:55 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/d426c3ad/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 3a6968d..25cf4b6 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1374,6 +1374,7 @@ B 985b6be4c8da0fa81d679d07b5449f191489204d B 985c14213ba4d60d911ea7b9bfb705455d85081c B 9879f3e1255d6a19dca7e9a167f647f8fa30f935 B 9881dc2e1c1f891d0b02c096d70e6993ee51b1fb +B 988e00cc13c612c9d03ef62096cc2c5f9790d279 B 98a481d18a94a0d41d9ffaa0b924445b4f47be2c B 98aa9b1aa8c03bbf3ed3058f852aae195ce5aaf3 B 98b58d094ce6a5c80470379ffb7eb5e48b0f0ce1