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 72F1517521 for ; Tue, 21 Apr 2015 11:46:20 +0000 (UTC) Received: (qmail 93863 invoked by uid 500); 21 Apr 2015 11:46:20 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 93799 invoked by uid 500); 21 Apr 2015 11:46:20 -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 93790 invoked by uid 99); 21 Apr 2015 11:46:20 -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, 21 Apr 2015 11:46:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E75EFE0542; Tue, 21 Apr 2015 11:46:19 +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: Tue, 21 Apr 2015 11:46:19 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 02a2189c2 -> 1cee0a36b 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/1cee0a36 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1cee0a36 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1cee0a36 Branch: refs/heads/2.7.x-fixes Commit: 1cee0a36b065b72c9d7f4c51eace0addfc5a5519 Parents: 02a2189 Author: Colm O hEigeartaigh Authored: Tue Apr 21 12:46:14 2015 +0100 Committer: Colm O hEigeartaigh Committed: Tue Apr 21 12:46:14 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/1cee0a36/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 762f0ae..be090cc 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -824,6 +824,7 @@ B 6a2f8cde20745bee06698884a7552a1f65a1b0f5 B 6a4a8fb4f545a0c7a222dca22323f972d4cd9202 B 6a825d6f00ee51a58effb6bc07339f62bb3ae67c B 6a8283e8c38f21e35513cc24b77e63819b97f0ee +B 6a8c0cdf85168ccf166cc27e4c0bf7395db2cd08 B 6a9664a633bda74f251474a3f31a1f07522c57bc B 6ab4f892c495b6d5c319363e02e307b6ecd47e93 B 6ac3db837134c8cce0a1b8d43db7c169150616ed @@ -1438,6 +1439,7 @@ B bbc50bca9a1c04cc30a8d618f7cf5fd52dd2d430 B bbe1a2adbd3d316ec38543ba2beaa8dd7f79b4ad B bbeddfc82ba8cb584fbebd271bfdc9a31e8e0829 B bbee298c2a1e457c2dae8e1d600517d218d4906e +B bc21b2058ee17462525e31716c707389241f1140 B bc3e23bd6dfe14f2d1471a286a6ea3d4e0556ade B bc534fa84edb3a1ec54d723d92b7754f43d2f248 B bc683e676e1465383dd84ffffd10911f5405a99a