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 04683180F1 for ; Wed, 11 Nov 2015 17:30:56 +0000 (UTC) Received: (qmail 64618 invoked by uid 500); 11 Nov 2015 17:30:56 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 64557 invoked by uid 500); 11 Nov 2015 17:30:55 -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 64548 invoked by uid 99); 11 Nov 2015 17:30:55 -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, 11 Nov 2015 17:30:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C3028DFA0B; Wed, 11 Nov 2015 17:30:55 +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: <93a0f1a3314c4279a4c809c29a38f7d1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Wed, 11 Nov 2015 17:30:55 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 5fdeaa495 -> 6bbb9c1ac 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/6bbb9c1a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6bbb9c1a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6bbb9c1a Branch: refs/heads/3.0.x-fixes Commit: 6bbb9c1ac4269bfbad6ab4a3c1c059e200016687 Parents: 5fdeaa4 Author: Colm O hEigeartaigh Authored: Wed Nov 11 17:30:50 2015 +0000 Committer: Colm O hEigeartaigh Committed: Wed Nov 11 17:30:50 2015 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6bbb9c1a/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 8c432a0..161f037 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -361,6 +361,7 @@ B a92a1e680d5c7f25ce80295629920fc367442feb B aa0263a09466130dab9ed36a0293ed245ab9b233 B aa5ef9fc7ed198021a246f99429d00863f336948 B aac1196c9e2ad02b596e24cc6f18cdb7ec30a21d +B ab05845f33e5744f9ed9c2b3569a1001c269f923 B ab3817f5068d88c60dc15ce52504435f9b715c1b B ab4eaac0be87291b7f053d144dc8fbf9d98634c3 B ac33a5b83e2c487a4e7c08c6c15539e64ceea24e @@ -377,6 +378,7 @@ B b19f59d369503a8676cb909e80af97e5814898a9 B b1b3fc2e1b4a0637d85bb67eb0a59abde91b0f9a B b1f19a1962d3791211ce83038e8641598c6f5ccf B b248d091551456c2fa8cfe0530dfdfc3632fe5e4 +B b297eed6d676eb0e5ee3fa4f597d04e1fb9652ed B b2b0c2af76a5aa77ad5103a3c94afad856e3bbe6 B b4536602d376a36bcbd02d21d5ab42f19d4e5b22 B b4872363fda49f205001d4385ecbc35133c2c755 @@ -524,6 +526,7 @@ B fa37d8722d154bbdec9d2acf4da16a04db0a34f1 B fa940162050202259c3ac7185d7fc2d7e65826d4 B fb94440f6f1d5c7c572b6c0163f275c95073b8ee B fb9d26581c364c62c7343847ebe4136b8c97700f +B fc54f21168a9294f2900bd6bc30d1b2eb5a172e7 B fc78cd31869a4e580c4d2a9e7864ae6dae8c311b B fcc8bcb38f33febf5c73c5f5f56d877272f27e20 B fd3471e58e63ee672babc015ed0929f6cd6862dd