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 677ED200C53 for ; Tue, 28 Mar 2017 03:08:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 65FD7160B9A; Tue, 28 Mar 2017 01:08:39 +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 B1859160B85 for ; Tue, 28 Mar 2017 03:08:38 +0200 (CEST) Received: (qmail 69883 invoked by uid 500); 28 Mar 2017 01:08:37 -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 69870 invoked by uid 99); 28 Mar 2017 01:08:37 -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 01:08:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C7882DFDCD; Tue, 28 Mar 2017 01:08:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Tue, 28 Mar 2017 01:08:37 -0000 Message-Id: <41f910331b294d2e91e50d05b5580586@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cxf git commit: Recording .gitmergeinfo Changes archived-at: Tue, 28 Mar 2017 01:08:39 -0000 Repository: cxf Updated Branches: refs/heads/3.0.x-fixes ab38f6471 -> 2a80a57ff 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/2a80a57f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2a80a57f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2a80a57f Branch: refs/heads/3.0.x-fixes Commit: 2a80a57fffc00c878d3d552fec8b92edc4ac3532 Parents: e046287 Author: Daniel Kulp Authored: Mon Mar 27 21:08:33 2017 -0400 Committer: Daniel Kulp Committed: Mon Mar 27 21:08:33 2017 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2a80a57f/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 38caf76..90b8ebd 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -204,6 +204,7 @@ B 205c61c48b2aad973572aa74d8c9dfa83c2dd7bd B 206738103f5d783d90695aa2e3e750736746d4c3 B 20a4f79a791cbdb5defe6a1c4c30b258c54d0fde B 20b7a7d610a00493b03c79c6f4767158ce495d45 +B 20d0fa3ec41c16c52b74dcc006f9d9ea212fa80f B 211a8fb4365714b26025f6964f7542e669931969 B 214b741754b078e41d471889b7233a90aac017b5 B 2164a191dfa9db0d9a2a8f38efcbfd953f5679d3 @@ -583,6 +584,7 @@ B 58592742163e7b7e28992304ed1ff2e7e8917f91 B 587b85261f83306ccdbbc5e0e176436f7991a28b B 5891c0d23b776d41be02e74a3b98a3881970d08f B 589f6c7fc52b4b2fa906ee62b558b0aa6f3f84ff +B 58bce070e55a52d4e67396dbcd5ef3deaf9636c6 B 58d40a843e50f7c581a9cc2373b431bf4a3f9780 B 58d5200bdc0f666615e99f1c624c53299120518a B 5902802031e7cf156fe5f0c7a804ec1a53127c27 @@ -1824,6 +1826,7 @@ M 7b31a2afca1ec599100511ce1f7428160618f389 M 7b4cb818cb6276dfd3a7432c796e67e98c8c941e M 7bf10fc3fb018d533409cc444c2d7b75144b9e23 M 7ffa1d7e54c88e2ee11e90e866bb34b5481762d4 +M 80121de418c1bba8cdf61ff41a87830ee71c2372 M 807be17959f36d64e4e6ec88ba0b8b1e58e04ec2 M 80f2e9ffa7825e477f6fe1ea47898e896b03c79d M 816e1a5ef4c0992a7d084a0529e42d9ad6a4a3c6