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 3496917E5E for ; Tue, 21 Apr 2015 15:12:47 +0000 (UTC) Received: (qmail 67074 invoked by uid 500); 21 Apr 2015 15:12:47 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 67014 invoked by uid 500); 21 Apr 2015 15:12:47 -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 67005 invoked by uid 99); 21 Apr 2015 15:12:47 -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 15:12:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D7FA4DFF7B; Tue, 21 Apr 2015 15:12:46 +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: <4e875a66e6cd4d2b9aadd337f3de7bdc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Tue, 21 Apr 2015 15:12:46 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes fe7f3d174 -> c7061f5a1 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/c7061f5a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c7061f5a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c7061f5a Branch: refs/heads/2.7.x-fixes Commit: c7061f5a18d9048c3221dc88fc5c923de7eb57ff Parents: fe7f3d1 Author: Colm O hEigeartaigh Authored: Tue Apr 21 16:12:41 2015 +0100 Committer: Colm O hEigeartaigh Committed: Tue Apr 21 16:12:41 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c7061f5a/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index be090cc..08dcebd 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -38,6 +38,7 @@ B 030c22d80f0824109eabcdab03d4145a6187246f B 035df3e5199f02906cb3e0fc375b987f712e5adf B 037abfeb72fcedc4178bc3788f18562446960306 B 037cc952b89b82db0a58e1008b0de2d83e4b281a +B 0391f12b7665e971d7df53edb0b75f5d0e953676 B 03a0a7e6f5f475e203489b9a03102c5ae77633f8 B 03e25e714fc2265214dffdb6f35b7ebb8e52ab11 B 04483ebcf4a4f603449fbc89fcaf394ca03f106a @@ -366,6 +367,7 @@ B 2d92576212e60146e57c1050fa9a63342fe05bee B 2dd4f36aa94e942363678e4bbb2d89dcac3a9171 B 2de6f1409be7e1b7aec9d03d6ace03c1f46498af B 2de9813278fd055767ec0b1eb8a6037f2582a910 +B 2df8ea0b32d7abbfbfb4710501e3489f913a6d37 B 2e0b830589e48bfc65501ad81065911b55186b42 B 2e0d84711a94a946aeff82e01f21412212f1fbd9 B 2e250f6900fee9214e4dff7596e8fcff7440e4b9 @@ -1157,6 +1159,7 @@ B 93c7a983914b27c2af3e614608abaef317b23a91 B 93ea0622ac97b3f0024b3217a76ba820a62eeb94 B 93febc0d4a3a108dc834d280e0fc51e9ad5afd0c B 944bf866d181d19ec78b38b856a7c637a68e88af +B 948502d11fcc1514e3c7237d51eb8a88ce6f2d70 B 94bd1cce747041cbadc644b8ad5394901f435bd9 B 94e4d75369ea6a062f298acddd1c1fffd284c44a B 94fd3cfdf6c6896482ae48a8e90006f214967fa3 @@ -1246,8 +1249,10 @@ B a01b3da2d4257fd44089e574a5ee35acf7ca64ca B a0ae89d855b7c03b0bb2ebff31606fff9b8858aa B a0aef78c0c059be5e3a33debe08a66b37b2989fc B a0c55ab2c91ec155f14bfa434339c6dcf723fad8 +B a0d3b619b56e2a3c3d4acc540fb38bfae525d9fe B a0e70fbf33886556bd38bd6548207b1358224856 B a1157adafdb757e461f5b696cc9bce46b2c96a4a +B a12ca523115c572f123727b8e9691da3e713c6fb B a1370a6201d0dfe9e449a0e159abc49831f9b7bd B a17804807504965226b927e22b8cd83a62666c1e B a18be4fac03d3886317b0201123e9917d1a33e60