Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9636318B24 for ; Fri, 29 Apr 2016 11:50:11 +0000 (UTC) Received: (qmail 40801 invoked by uid 500); 29 Apr 2016 11:50:11 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 40735 invoked by uid 500); 29 Apr 2016 11:50:11 -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 40726 invoked by uid 99); 29 Apr 2016 11:50:11 -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; Fri, 29 Apr 2016 11:50:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0EA55DFB81; Fri, 29 Apr 2016 11:50:11 +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: Fri, 29 Apr 2016 11:50:11 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 1f403f254 -> 64fab1476 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/64fab147 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/64fab147 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/64fab147 Branch: refs/heads/3.0.x-fixes Commit: 64fab1476864dccd4ae54223c0c8cb270dc660f8 Parents: 1f403f2 Author: Colm O hEigeartaigh Authored: Fri Apr 29 12:50:05 2016 +0100 Committer: Colm O hEigeartaigh Committed: Fri Apr 29 12:50:05 2016 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/64fab147/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index f0241fc..a4440af 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -331,6 +331,7 @@ B 5ab86e5dd81d68814a12e9c94a6a1b83fdc14f37 B 5b26ab08f19f6c55a45c0f1f7ddccd09b0a2ed23 B 5bac26a132e7999bf0bd108d4cffb674873a56ca B 5bc8c0c41e3cef645ee6c7a1587d19e844fc7e4c +B 5bf7ea849a7de8ec2335f6172b4e05848480fb4a B 5c541cd9c16ed2d982085410cb801f2f21dbc82d B 5c678face89e4d38b2879bc4679ce3b92ac3aeb0 B 5d0ac9e12b9658fbfea8c7c952783973462eabac