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 4E9A1200B33 for ; Wed, 29 Jun 2016 19:36:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4D2DF160A57; Wed, 29 Jun 2016 17:36: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 BAFBE160A3C for ; Wed, 29 Jun 2016 19:36:38 +0200 (CEST) Received: (qmail 12379 invoked by uid 500); 29 Jun 2016 17:36:38 -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 12369 invoked by uid 99); 29 Jun 2016 17:36: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; Wed, 29 Jun 2016 17:36:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CCC8FE5CE1; Wed, 29 Jun 2016 17:36:37 +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: <8c30f5979fb0449fb6e6810a9217c287@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Wed, 29 Jun 2016 17:36:37 +0000 (UTC) archived-at: Wed, 29 Jun 2016 17:36:39 -0000 Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 087f7390c -> 206738103 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/20673810 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/20673810 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/20673810 Branch: refs/heads/3.1.x-fixes Commit: 206738103f5d783d90695aa2e3e750736746d4c3 Parents: 087f739 Author: Colm O hEigeartaigh Authored: Wed Jun 29 18:34:57 2016 +0100 Committer: Colm O hEigeartaigh Committed: Wed Jun 29 18:34:57 2016 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/20673810/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 1881424..594b993 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -99,6 +99,7 @@ M 2e8219cf3d047abc3a7e2611bf284aadbc20b7d6 M 2f8a1f7645c30cb40d4f080ce4b4099964028751 M 386805560479b35276d88605c5acf805e3004aa5 M 39c772a0764b323f98ab58e00345f4fca924c425 +M 3a1fa0b23f1778594b6339dfcfbc90dcc43a87d4 M 4799fef822a96f5d1b2827d5cc42ab886fd4e673 M 4837a6cb5ea319f6bf87aaf3bf49c1e4e99e45a7 M 4b0868a8ee6f53d8543860a458821c35ec2a79a2