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 68C71200AE4 for ; Fri, 24 Jun 2016 14:32:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6769C160A5A; Fri, 24 Jun 2016 12:32:40 +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 D7944160A38 for ; Fri, 24 Jun 2016 14:32:39 +0200 (CEST) Received: (qmail 28353 invoked by uid 500); 24 Jun 2016 12:32:39 -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 28344 invoked by uid 99); 24 Jun 2016 12:32:39 -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, 24 Jun 2016 12:32:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ED86FE049D; Fri, 24 Jun 2016 12:32:38 +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: <6fb39de310ef47228faa3699f4524f9f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Fri, 24 Jun 2016 12:32:38 +0000 (UTC) archived-at: Fri, 24 Jun 2016 12:32:40 -0000 Repository: cxf Updated Branches: refs/heads/3.0.x-fixes ad649c4c2 -> 68504b6f4 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/68504b6f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/68504b6f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/68504b6f Branch: refs/heads/3.0.x-fixes Commit: 68504b6f475a09477ee93728fd30e80b9d46b922 Parents: ad649c4 Author: Colm O hEigeartaigh Authored: Fri Jun 24 13:32:31 2016 +0100 Committer: Colm O hEigeartaigh Committed: Fri Jun 24 13:32:31 2016 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/68504b6f/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index e78558c..d775f43 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -57,6 +57,7 @@ B 11ea395d0fa226c040f4ca3c4c6114a90ce34e06 B 1214338f24a3a7973f2bd72ca01fc57644bcc45a B 12206c314d34f2e210f7292fcb7a3e894fafd4e7 B 12225d4f560c30839fd8f2ecb6657663d7559a27 +B 12b8e711d2068044caa9ceb57e3fe038e4e92cfc B 12c325a12e897b3fac6afbd9ec2fe34dcaaa9d02 B 12d7631bb74f7034c2635f1f253eef79b0fae0ca B 1308529e8b6a325143fea8256c98e37f79016170