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 44500175B7 for ; Wed, 7 Oct 2015 10:47:29 +0000 (UTC) Received: (qmail 75145 invoked by uid 500); 7 Oct 2015 10:47:29 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 75078 invoked by uid 500); 7 Oct 2015 10:47:29 -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 75069 invoked by uid 99); 7 Oct 2015 10:47:29 -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, 07 Oct 2015 10:47:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DB338DFBD2; Wed, 7 Oct 2015 10:47:28 +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: Wed, 7 Oct 2015 10:47:28 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 86f0e5646 -> 7f1431224 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/7f143122 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f143122 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7f143122 Branch: refs/heads/2.7.x-fixes Commit: 7f1431224bf86c2617eeb7347b242c76f29c82c1 Parents: 86f0e56 Author: Colm O hEigeartaigh Authored: Wed Oct 7 11:47:23 2015 +0100 Committer: Colm O hEigeartaigh Committed: Wed Oct 7 11:47:23 2015 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/7f143122/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index fd994fc..c9966e6 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -229,6 +229,8 @@ B 17f221b25e01a9c5824b0005b30e8aee0668fea7 B 17fef20055ca5ae3495e6fe923a9048dab0ac3a7 B 183b062de15297fe5264d023237ad7e8d666604e B 184f5126dd1b12676e6f59dabc28631d5b0a4915 +B 184f7df15d0c63c6488ee2ca6592e5177b484a56 +B 185614a2e18d1f2b91bbbc85372c6e6ee6fd004a B 185f6743a55a4a318542beb86564c6da6d35d523 B 186cab6a97027e54e8785deccf4433d41ad0139e B 187d35e7fff245c66fc582d20b390534371a6fde @@ -387,6 +389,7 @@ B 27e80bbffacc5d119d53f203ed1044a406969497 B 27fa54fcf7220076503106fa554b1eb74d8103ac B 2816469014ec116559cd405720271457f13432b9 B 28244858cadc3596f760b37c1e1f9331441364d2 +B 284341e77e64e826bfd53992d0780ea679e3763c B 28b53b095af7e53e9bf6f4265ca39ff405619eee B 28dc0430fdf141960668570037b862acb1a520e9 B 28dfd5823c055913a5ef36657eb2b5e14aaca83e @@ -574,10 +577,12 @@ B 3c5d07049883ddabcf7101ae6f5ac9c19d12937d B 3c5f5a96a8fed38cbeda5866b18c29835100267d B 3c78d3be567447c50d10ed52fcfe231525d2bf9c B 3c95b4b01da194ba34a2230dd00a2333d820464a +B 3c95de67c28515ffc7199f4264ef2c2023ac5e09 B 3cd23910e77dfb21c9622cf96c5118765a79e03c B 3cd24f083d410f2335245a377f961b48341705fa B 3cd2f8f4a1c6786be106b8b1fb23ef62e77dc698 B 3d1078b0717fec4e52d680bf9922e81f62702d63 +B 3d581961a11f614b8547aad5406696013cd892f3 B 3d635a7989366b61ce55231c82c8625aa75b8524 B 3d701b59b57942fa0800a54cd46e3f049208da71 B 3d7bc62e71a4ef124bba4be767d8350fc74f34a1 @@ -1504,6 +1509,7 @@ B a497422ec0a70862382e26e91b73efd07ccbfb0d B a4bd823619a70e472fcb93e2490d3dc629d088b2 B a4c85510a14854349d877510d3688c47457e6b3b B a4e9143f9bba3bf4ab07e0af5d46b30f135d687e +B a4fa2aa7885aa4635f24436fc326f680c4312ab3 B a5466488bec01b3aaa136808198d14447717e42c B a5474c503387b4ec2836161394a449ff83a7deb7 B a571dbe318a5114353edfb67af9704356122c296 @@ -1705,6 +1711,7 @@ B bce66cb2a1a93829127408e88aa47e3a1a905148 B bcec16a62c6f0ec665a93f3e3960761fc41dedff B bd565683e0696acca674b45e3c312af0120e4a1a B bd624a88b47708daeefc726f8de3ada4a33fdb52 +B bd6595a615698a17a233e3baeae9f209090760a8 B bd6fc7ef76c99067e6b4699f2fd7dd4d0f480ca7 B bd88de78866e4da2f88a464791e7c44de7c02b37 B bd9c0fd1dcb6c637f1069b48a2c4e4042c127a18 @@ -2084,6 +2091,7 @@ B e67312c2af732de561a4d8f4f14566f44f813b6e B e67ec6fd6a34d089de726c5ff6db6236659759d2 B e68a620a1d896b9e8c258b48ca6b129d6d53884c B e68bd71f0145ee6719d80328366209a07b984df5 +B e6c98aae938b78d2b66db838b92c47c6d0833b76 B e6df01723bf9d091ef2fae86c12aebe95a7141b7 B e6efdf5432f714ead11411495cdf73164a26d561 B e759be97a6b81c18efb442411e0a56e9d4931455