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 321BE200C21 for ; Mon, 20 Feb 2017 18:53:08 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 30B77160B73; Mon, 20 Feb 2017 17:53:08 +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 7B40C160B58 for ; Mon, 20 Feb 2017 18:53:07 +0100 (CET) Received: (qmail 32183 invoked by uid 500); 20 Feb 2017 17:53:06 -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 32174 invoked by uid 99); 20 Feb 2017 17:53:06 -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; Mon, 20 Feb 2017 17:53:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8D2BEDFE1E; Mon, 20 Feb 2017 17:53:06 +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: Mon, 20 Feb 2017 17:53:06 +0000 (UTC) archived-at: Mon, 20 Feb 2017 17:53:08 -0000 Repository: cxf Updated Branches: refs/heads/3.0.x-fixes b3c37aa8b -> ae9239a00 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/ae9239a0 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ae9239a0 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ae9239a0 Branch: refs/heads/3.0.x-fixes Commit: ae9239a00f60e1f26e0a4d1a8c1d831abcda7258 Parents: b3c37aa Author: Colm O hEigeartaigh Authored: Mon Feb 20 17:53:01 2017 +0000 Committer: Colm O hEigeartaigh Committed: Mon Feb 20 17:53:01 2017 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ae9239a0/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 7de741a..594097e 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -9,6 +9,7 @@ B 015d7a6dde4e201aaf8eaa90343b6ca9a20f6856 B 01956cc9af68f80d4f12018a3779c12f36d5308e B 01bf5f841d27d94485018912a575e4d9b50caab9 B 02ad8d847f014b9b04af74c7e4eb7407899546eb +B 030437b55217abfa1d7bb217994a47588ffa9126 B 033815a0e180b8e1abfcc0c1acdbeb0219ad256d B 035154fb466fb9c833804d1bc747804df9e9992b B 0384a69b7bc0b4846e89469f974ace534e7734d7 @@ -30,6 +31,7 @@ B 06fbd75b77597a6b413c72ab845578ba03bf3a21 B 07297f3c75c3d16a6d81b423d545ababd714f5b9 B 073529c953211160cf9392334a1f9546cb4e0a45 B 07c6322a52c12077567a48c9a87e832ea9362886 +B 07fc13ec7be25b4f62c0a8858194f36c1699bf51 B 08246e10e00396811bddf64a3e131b580afb12db B 0848bdb305b5d6e542da417ff5fd9e7c9ace5381 B 084ad67a648c736e911fa0a419d6e5cca345c1b2 @@ -526,6 +528,7 @@ B 59bbab2f13a9e56dcd2dfff971bd608549454b91 B 5a1dd7723e3c21267e12d1562f4a2425049bc7ad B 5aa988b13f1a91a8bf4571bd9b84bc364c4d7e06 B 5aa98c1c2391ba9ce86797119a972ae56a4a9fd0 +B 5aaf49b18e4c2962eeb2260ad30072b553838efb B 5ab86e5dd81d68814a12e9c94a6a1b83fdc14f37 B 5afe2b87e820a9847e5b6cfbac3d9c85a28f0a19 B 5b26ab08f19f6c55a45c0f1f7ddccd09b0a2ed23 @@ -1006,6 +1009,7 @@ B b248d091551456c2fa8cfe0530dfdfc3632fe5e4 B b28a097a87c0f458d61a9b20f9e04f48ddd3c599 B b297eed6d676eb0e5ee3fa4f597d04e1fb9652ed B b2b0c2af76a5aa77ad5103a3c94afad856e3bbe6 +B b2bad7f9eba17cac427edbab18b4b6f9c8ef7556 B b2e34286753bf61581fa084a90f6707918042419 B b2f6ad83021c1ff4c1f3118bbe4b27b938842f01 B b301d5628e0c239cd2c2bd24695e52d746114e17