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 C5D2117ED6 for ; Wed, 3 Jun 2015 00:55:18 +0000 (UTC) Received: (qmail 85360 invoked by uid 500); 2 Jun 2015 20:55:18 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 85167 invoked by uid 500); 2 Jun 2015 20:55:18 -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 85128 invoked by uid 99); 2 Jun 2015 20:55:18 -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; Tue, 02 Jun 2015 20:55:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 10F5FDFA70; Tue, 2 Jun 2015 20:55:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Tue, 02 Jun 2015 20:55:20 -0000 Message-Id: In-Reply-To: <58f010cd8f754b938e8741ea12932c45@git.apache.org> References: <58f010cd8f754b938e8741ea12932c45@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cxf git commit: Recording .gitmergeinfo Changes 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/9ab464fe Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9ab464fe Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9ab464fe Branch: refs/heads/3.0.x-fixes Commit: 9ab464fe50cd732a5b25da686be59563daf94221 Parents: d1fdbcd Author: Daniel Kulp Authored: Tue Jun 2 16:55:10 2015 -0400 Committer: Daniel Kulp Committed: Tue Jun 2 16:55:10 2015 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9ab464fe/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index f31579f..9eaaf4c 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -250,6 +250,7 @@ B ab4eaac0be87291b7f053d144dc8fbf9d98634c3 B ad5763ef8ea1ff3c8ddea2c3a6fabdaae6acddd6 B ad700a5f6471f55680821f6d04b182f5d3a6054e B af100a919178b0938fcc04d9c8d1dd1269e351b9 +B afd70f562f769c1f1ed26a275cbb3763b24cba43 B afeb2ab056a4a4377db11d597c675108eb780d16 B b08a6ba02f0e67ea29cc69fb5c878fc1e57dee75 B b18a2bad64c343520795175cf377cdf1b981da2a