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 BE73D200AF5 for ; Thu, 2 Jun 2016 18:42:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B91DB160A51; Thu, 2 Jun 2016 16:42: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 0E484160A3E for ; Thu, 2 Jun 2016 18:42:54 +0200 (CEST) Received: (qmail 41187 invoked by uid 500); 2 Jun 2016 16:42: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 41177 invoked by uid 99); 2 Jun 2016 16:42: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; Thu, 02 Jun 2016 16:42:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 27D6EDFE65; Thu, 2 Jun 2016 16:42: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: <70c80114678e4416b0f1386e84f2be0f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Thu, 2 Jun 2016 16:42:54 +0000 (UTC) archived-at: Thu, 02 Jun 2016 16:42:55 -0000 Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 4e968fae2 -> 9493eaa45 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/9493eaa4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9493eaa4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9493eaa4 Branch: refs/heads/3.0.x-fixes Commit: 9493eaa45845c9f8dada34ba96527a233eda350c Parents: 4e968fa Author: Colm O hEigeartaigh Authored: Thu Jun 2 17:42:48 2016 +0100 Committer: Colm O hEigeartaigh Committed: Thu Jun 2 17:42:48 2016 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9493eaa4/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index b7e1ebc..aa3de00 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -87,6 +87,7 @@ B 18d64577e5ef1ef3ce26e82db1821b894bd43578 B 194224faeb3e8eb6c8feabe6397f6b42ff0f605d B 194f9cd98da50140e8184ff4835811875aa5ecfe B 1960703149a11052490cf16ec3682408470298f9 +B 19cbe748cf0753671e50a643d845a5700c53777b B 1a5708e21708a9ed96991cd56ff89b3fd4eac15a B 1a8fd7c02bc6a620e276086b665d430217116767 B 1b3f01b4f640beea1f1247416ad9891e615f816c @@ -517,6 +518,7 @@ B 8ee1ce727f04099b2bbeea4164ad38005de769b3 B 8eeef8c9f10795c856ce81d98557d81bf853b6df B 8f138f5a57736de2c78044bc6c01eed5e3725c68 B 8f226d9ed11a582b2e3eaf9147fa14bb932844e8 +B 8f3d9d0b2af457dbc67e11ac800b53003ba81262 B 8f967643447ceec89e58b079d8d8fc00cf232a02 B 8fc16041a43d53965bc0ed794cc8ac13580f429f B 8fd8c552f4c2a980a5138de19a2b74104776a4ba @@ -554,6 +556,7 @@ B 9896b920035a1d1be1aef28a1d1a5eb876445c82 B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe B 99f4092de01d60b8369ff84036d543e9d20ecefc B 9a2c82620001b76a2065960686f9bc8f384c4d58 +B 9aae4e7641034fd090afdd847764d26e6d0b17b9 B 9aae5c5622dec1198a333ac6bb3508d3ca4634c1 B 9ac66adffb73f3474fde064fab1013ecdd24be7c B 9ae69b3b323f48de033f62be9fc2780f11b0c761 @@ -651,6 +654,7 @@ B b248d091551456c2fa8cfe0530dfdfc3632fe5e4 B b28a097a87c0f458d61a9b20f9e04f48ddd3c599 B b297eed6d676eb0e5ee3fa4f597d04e1fb9652ed B b2b0c2af76a5aa77ad5103a3c94afad856e3bbe6 +B b2e34286753bf61581fa084a90f6707918042419 B b301d5628e0c239cd2c2bd24695e52d746114e17 B b3679092603a89574d597035c23e3d3662a796a4 B b38e4510c2063e234d6fe02231693a0a281a0147