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 F3D4C200C6F for ; Mon, 24 Apr 2017 17:03:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F2A92160B99; Mon, 24 Apr 2017 15:03:17 +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 5AD28160BB5 for ; Mon, 24 Apr 2017 17:03:17 +0200 (CEST) Received: (qmail 11650 invoked by uid 500); 24 Apr 2017 15:03:15 -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 10639 invoked by uid 99); 24 Apr 2017 15:03:14 -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, 24 Apr 2017 15:03:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 17AB4E04F2; Mon, 24 Apr 2017 15:03:14 +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 Date: Mon, 24 Apr 2017 15:03:14 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cxf git commit: Recording .gitmergeinfo Changes archived-at: Mon, 24 Apr 2017 15:03:18 -0000 Repository: cxf Updated Branches: refs/heads/3.1.x-fixes c5e3bd874 -> 6b9d2d649 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/6b9d2d64 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6b9d2d64 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6b9d2d64 Branch: refs/heads/3.1.x-fixes Commit: 6b9d2d649a0b67fb15904b5b99deda2824a7553c Parents: 0010efb Author: Colm O hEigeartaigh Authored: Mon Apr 24 16:03:06 2017 +0100 Committer: Colm O hEigeartaigh Committed: Mon Apr 24 16:03:06 2017 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6b9d2d64/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 7e60a22..a09a6ec 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -28,6 +28,7 @@ B 111d52fd4b92d0222af9bf1c22156145ea01ed01 B 1224d5cc9f646aa3a4924ce9cb045366d2f4cdff B 122d1f64f248294a4303632571ec363aea4c2179 B 1304bc2ffbe6b4c3bfdc4e4f47e5e224e52fd808 +B 1329e2c2b2f83a7b6e80ad2f15a2602161343749 B 137485de37b3bf81e305e616a5af81741620f547 B 140ad80be96ea11d360cd7a1d8e791ca91a2220d B 1552f881183ba35b3706dc3c8061d7c6d85c7238 @@ -539,6 +540,7 @@ M eb31ffe4f95c4dc6ac9a2ac56e15ae89b578359e M ed9298066428c0dfc4590a556876d696a4ba13c0 M ee248ce7a4a1b04bcbddbdcef82d695ccc140160 M f133df0f691191fac9566726db06c9b4dc7b65a6 +M f3304a89a7e93e9c466ee5dbd8d97ffe2d50f50f M f462c797eab75e9b6c6c352b4baeb84429866068 M f7f017f2187d59369a7b94bb053f1e297972dce7 M f8439a92170c4cc6a13cf7b9a3c0eec994ebeec5