Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9D47F2009C6 for ; Tue, 31 May 2016 16:34:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9BD2B160A44; Tue, 31 May 2016 14:34:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 124F61609AD for ; Tue, 31 May 2016 16:34:54 +0200 (CEST) Received: (qmail 36089 invoked by uid 500); 31 May 2016 14:34:54 -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 36080 invoked by uid 99); 31 May 2016 14:34:54 -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, 31 May 2016 14:34:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0A403DFB74; Tue, 31 May 2016 14:34:54 +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, 31 May 2016 14:34:54 +0000 (UTC) archived-at: Tue, 31 May 2016 14:34:55 -0000 Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 0fee635ae -> 42f6750b3 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/42f6750b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/42f6750b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/42f6750b Branch: refs/heads/3.1.x-fixes Commit: 42f6750b3690a19d906c2d9fb146d8fafbcb7620 Parents: 0fee635 Author: Colm O hEigeartaigh Authored: Tue May 31 15:34:49 2016 +0100 Committer: Colm O hEigeartaigh Committed: Tue May 31 15:34:49 2016 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/42f6750b/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 4d584f9..dce225a 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -67,6 +67,7 @@ B e14d803ff84be7c59dd7c2321f1090231967d45c B e1c60863ac10b56d423613c7d3d2f45c7ce18e14 B e61a83d4ac18fc760fc5d4bc8fb19d6072aaac52 B e6f0722615190861192972a51b3986b34efd1f0e +B e824784db1bda81c68aaa407f471588acea38865 B ebce4a65b15a1a99f18c1ea0111affafc447ce7e B ec3103f88b20fc05e92994b6a06b65b4a91dd75a B ee6ceea0d493b1b2dc6d83ca6923c3baed81885e