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 E0498200C45 for ; Tue, 28 Mar 2017 18:36:09 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DD300160B89; Tue, 28 Mar 2017 16:36:09 +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 2FD2D160B6B for ; Tue, 28 Mar 2017 18:36:09 +0200 (CEST) Received: (qmail 61591 invoked by uid 500); 28 Mar 2017 16:36:08 -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 61577 invoked by uid 99); 28 Mar 2017 16:36:07 -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, 28 Mar 2017 16:36:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 79AD8DFF32; Tue, 28 Mar 2017 16:36:07 +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: <191c27efa74e4c09acd75e5eda624f69@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Tue, 28 Mar 2017 16:36:07 +0000 (UTC) archived-at: Tue, 28 Mar 2017 16:36:10 -0000 Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 36eff36d4 -> 622442a78 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/622442a7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/622442a7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/622442a7 Branch: refs/heads/3.0.x-fixes Commit: 622442a78f41b41bf52a85c6a620262b8436f43b Parents: 36eff36 Author: Colm O hEigeartaigh Authored: Tue Mar 28 17:36:01 2017 +0100 Committer: Colm O hEigeartaigh Committed: Tue Mar 28 17:36:01 2017 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/622442a7/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index ba25a06..5531a9c 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -533,6 +533,7 @@ B 4f70bdf4199a666829cf9c6c62c508d12afbe251 B 4fbb05ce31ccfee730d144f328b90f300a64693b B 4fe7844935f9b4ad797760613d143949f9448905 B 4ff4cf5f28b22bc85cc107a9d31545c53c04845a +B 50100ff72df3a29f21c09405a4262974165fa6d5 B 5015c0c1ccb3bda0d83570c8b0e9889900d68221 B 503567af618e7b7a402df5455be7ef7ea0c0a9b6 B 504b427081cfc2213ce0a5c050b16af67ca7ff46 @@ -732,6 +733,7 @@ B 6f7bfef950da7c4e629c4b3d4fecbdecdc03bbd9 B 6fb43da4f6c1578aeffe0a8a24dc27b597aec2c6 B 6fb880420de545f7ed09199674b7fec3d0ba4d7c B 6fe5b5a80d477ba460c223e62f4b73b825cd3771 +B 6ffbba84101f30b7ea481fb9f508e5ae418df853 B 702f27bc4a334b2d117262252632bf580f20f711 B 70837021f60524b60e4328c5f422227c6170ff30 B 708f53f7af5a53003f642a4422d8c11de18f8889 @@ -1071,6 +1073,7 @@ B a67a0a69214717c7c92baa27f74000d5af895c83 B a69839b8b7a776b9deb80bdf14942b231761ad53 B a6af7bddf7c00e0d8d6db4f84ac87dd93bd2a9e8 B a7287694f81d87e299b331d6594740614331bfe1 +B a754efaefd486e23587fe671dfbcd5955312bf92 B a75df553a2bb0cee94b96fababa723d7d0f45d90 B a77c05fcbef3f8a0d963dd196fa1f142a975f6cd B a78e2e4d67628577ee9418412e8f89fe0c3c243b