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 CD4AB200C2A for ; Wed, 1 Mar 2017 18:24:42 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id CA4EC160B70; Wed, 1 Mar 2017 17:24:42 +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 4167D160B56 for ; Wed, 1 Mar 2017 18:24:42 +0100 (CET) Received: (qmail 36100 invoked by uid 500); 1 Mar 2017 17:24:41 -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 36091 invoked by uid 99); 1 Mar 2017 17:24:41 -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; Wed, 01 Mar 2017 17:24:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4D167DFDE6; Wed, 1 Mar 2017 17:24:41 +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: Wed, 1 Mar 2017 17:24:41 +0000 (UTC) archived-at: Wed, 01 Mar 2017 17:24:43 -0000 Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 3ab94c4bc -> 06d2a32ad 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/06d2a32a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/06d2a32a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/06d2a32a Branch: refs/heads/3.1.x-fixes Commit: 06d2a32adda4cb32580ca25c83e6b67dfb143ae9 Parents: 3ab94c4 Author: Colm O hEigeartaigh Authored: Wed Mar 1 17:24:36 2017 +0000 Committer: Colm O hEigeartaigh Committed: Wed Mar 1 17:24:36 2017 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/06d2a32a/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 7673bfb..e50b89e 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -63,6 +63,7 @@ B 39a5690d7d50d8481739c290f49128be4d55f8ad B 3b2f2ed2db01f05fa9b648693ce33978ccc8ede8 B 3be1cef6d16eeee405b7e046c822c27dc7223f24 B 3bebf6b49283d9a9c36365c030533a3508f836c7 +B 3ce7f00461d9c868301003b5c16138c491a9ac0b B 3f259221fa1dd9227397400ed9653374cb4fdc39 B 3fbedf1397714824b9700cd4d49569087936fe1a B 40380d8e57cdea0d909f3a9ee207628831c202fa @@ -182,6 +183,7 @@ B adcfa17d94da4b27deb8ba952d0bd4dcfcf6972b B ae83629e6291538e72d300fb35d7f6df7cf064a1 B aed1b1d45ea12b1b1a7f083f756c27ed914ad9b7 B aeecef53263cd1d595d991654f0a783a10adfdcb +B afdf9361f1c3ce49c8440a5f2615bde2bb42c684 B b2c10cc6c18a6e6589d258436303c46b3f682f7e B b3ec59efcd10cf64a1bb8a399082071905f5baa9 B b7cd2fb4b883cf9f6972d3593ecb0e1d31be7245