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 9E8891828D for ; Tue, 4 Aug 2015 11:16:54 +0000 (UTC) Received: (qmail 9706 invoked by uid 500); 4 Aug 2015 11:16:54 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 9643 invoked by uid 500); 4 Aug 2015 11:16:54 -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 9634 invoked by uid 99); 4 Aug 2015 11:16:54 -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, 04 Aug 2015 11:16:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 64168DFEFE; Tue, 4 Aug 2015 11:16:54 +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: <9532fe45aa1841059fede5fc60c9d460@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Recording .gitmergeinfo Changes Date: Tue, 4 Aug 2015 11:16:54 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 6c2ab7d08 -> 3c646bb34 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/3c646bb3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3c646bb3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3c646bb3 Branch: refs/heads/2.7.x-fixes Commit: 3c646bb34382d82da2bbfa49d9cd9ccefa87dab8 Parents: 6c2ab7d Author: Colm O hEigeartaigh Authored: Tue Aug 4 12:16:49 2015 +0100 Committer: Colm O hEigeartaigh Committed: Tue Aug 4 12:16:49 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/3c646bb3/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index f3204e9..adc83e1 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -47,10 +47,12 @@ B 0391f12b7665e971d7df53edb0b75f5d0e953676 B 03a0a7e6f5f475e203489b9a03102c5ae77633f8 B 03b7d19c8e934e98040f064bb36843638b428f63 B 03ca89d27ae2e187b562af4f3dfdbe44cd17e0b1 +B 03e18fa6b0348f51c513e1301db104ce89844d94 B 03e25e714fc2265214dffdb6f35b7ebb8e52ab11 B 0410877a4d50038125e383dd4cf00089a947bed0 B 04483ebcf4a4f603449fbc89fcaf394ca03f106a B 0470e3a044828a96fda7193ff8f3faf3f05b950b +B 0479e4610d38cf7561ab594bbb6c61049df3dab2 B 0494f762414f065b8858b7b279e7db9de3660b3f B 04a3c603e46f529e9f2a3602168a051db96e1657 B 04b535bbb4667e43492515718a061553d50644d8 @@ -1034,6 +1036,7 @@ B 7521ad685276b02af30a5fa145dbced0b91058fd B 7524807b1dc58e4052eac67d623835f9eeb2b458 B 753557e9dcc97db25d4214759506ff350a992d60 B 7553e8420efb44f974fd02531597c0e610ecfacc +B 755a1a5cac5ebc32d1cdd5df795aff6e9b9de6c5 B 756994d4acce00cac3b2ce64752c0a894eac69ad B 7569b706d806b5143a65fd20b9509ba85d32d88c B 7582422a2b57bf1846b50117a2c604368565f397 @@ -1944,6 +1947,7 @@ B df94a7fe524549455ec65c3068a39a1d1d37acb1 B dfbe1e515a3aa4283655b422b4f717d05cc77415 B dfc1b4ee70cf6e6aeea19d8e303b0811b914156a B dff1ddd57cf1210561bd8708b7bc9796ddc510e6 +B e0157c4687d1e88d1fb79ae5357373588a0ab0ae B e01fc4aae66285c5567eb34d01f8ebc41274424c B e027dc7d5235f93d848861e07226ff9a1a1d1d23 B e036bbd0c595514677ef1c28eb47bed3e427b709