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 444F0200C00 for ; Wed, 18 Jan 2017 16:11:10 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 42D13160B3A; Wed, 18 Jan 2017 15:11:10 +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 AF524160B34 for ; Wed, 18 Jan 2017 16:11:09 +0100 (CET) Received: (qmail 26675 invoked by uid 500); 18 Jan 2017 15:11: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 26666 invoked by uid 99); 18 Jan 2017 15:11:08 -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, 18 Jan 2017 15:11:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8FBECDFA85; Wed, 18 Jan 2017 15:11:08 +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: <02c4f5640e4d40ccbfccfb352bea4ec8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Wed, 18 Jan 2017 15:11:08 +0000 (UTC) archived-at: Wed, 18 Jan 2017 15:11:10 -0000 Repository: cxf Updated Branches: refs/heads/3.0.x-fixes a3811331d -> 46b385f98 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/46b385f9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/46b385f9 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/46b385f9 Branch: refs/heads/3.0.x-fixes Commit: 46b385f984f573d5dabfbe1bd6fa84f8af628484 Parents: a381133 Author: Colm O hEigeartaigh Authored: Wed Jan 18 15:11:01 2017 +0000 Committer: Colm O hEigeartaigh Committed: Wed Jan 18 15:11:01 2017 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/46b385f9/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 28f57c5..ca0f8a8 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -211,6 +211,7 @@ B 289ee01f0c874303d5e7b473482cdf46e5f59685 B 28a4e2ea5a35247cc50a2013371bcc178ff1d390 B 28e185b27e8c80cd773cac46d1b9b19529c4fab0 B 28e8f04af96d3e353f0da5018a4531d45592c663 +B 28f5b79d67db9b768b35fb71ee1e6fd488ae5cbc B 2900f02ff288ac8346ed0022d5a63352646a2ea1 B 29129d880455fcd535fdb9004a7677fcd1f51906 B 292fe2541e32bb31a59955975972cd6adfa1a9dc