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 4262211F0F for ; Mon, 23 Jun 2014 11:49:16 +0000 (UTC) Received: (qmail 11958 invoked by uid 500); 23 Jun 2014 11:49:16 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 11891 invoked by uid 500); 23 Jun 2014 11:49:16 -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 11882 invoked by uid 99); 23 Jun 2014 11:49:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jun 2014 11:49:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CC627887494; Mon, 23 Jun 2014 11:49:15 +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: <0bb8c3de80be44798e14e60c6f4c3e16@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Recording .gitmergeinfo Changes Date: Mon, 23 Jun 2014 11:49:15 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.6.x-fixes de766416b -> 144ab3915 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/144ab391 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/144ab391 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/144ab391 Branch: refs/heads/2.6.x-fixes Commit: 144ab39154fa280b1540c208e2391a9aa5f20eef Parents: de76641 Author: Colm O hEigeartaigh Authored: Mon Jun 23 12:49:00 2014 +0100 Committer: Colm O hEigeartaigh Committed: Mon Jun 23 12:49:00 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/144ab391/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 0c63e3f..40bb156 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -510,6 +510,7 @@ B 70174590b7e6d1bf9f10de82a34ca45a8bb10126 B 70560716d6b01729df93c95d9104c99d2061fc77 B 705d3c9c9b4aa1d94640229d04a1497089662e68 B 709b8aae51997f9cdb5f370b33e8c1bb017abb7b +B 70d7e6b8b3134ea9e51159e26d8ce03eda30b1bf B 7105da8a6424e4537ce04c054c0374fe5fb6d4bd B 714fff051c332deeadcd9ccef2953fbe09dbc70e B 71c14c19d2815c6272fe3d5090ab7263218e788b @@ -560,6 +561,7 @@ B 7b8cf2deb14bd9227d68f48c22f0a7cb3109a07c B 7b95352067a8e8d1528568601a24d8d3501d53d0 B 7c34d08196e6be0d1e14fbe1224b7d7c968611fb B 7c690b493083fc1e271a737f4144e350a38a65b8 +B 7caa3969d928131e03591a3fe9250848d8110048 B 7ceda035062a8e559e1eab69de6f19e224ba1824 B 7d69d040de9e8bf8beaf06ffb4ecd6908eb17693 B 7d9f038f5ac5dca27eaa8c0e2249fd4fcb46d579 @@ -834,9 +836,11 @@ B b5d74e98b4635a3feb3092e460babd496dd63dea B b5fa6478c64f0c50361408f99dd7b02a71004e0c B b612282510ceb074afef6094ac2a1467980dac16 B b8669c9a39b4d6c8e178fe0303afbaff92323735 +B b86d56a10d41f3e470db2105775aec2b16178628 B b8700e9305c0e201ab694aecd0e1dcceb0cdc9a6 B b8d1d726c9dfa128b8227d66f157b14fe697da6f B b8eb4c0667056920e700d90c421beb0d0fdde6e3 +B b90489c9093ea83daa95401ed4f04301af17b9f0 B b911f54c3cc32038777174331acba3154afd4ea7 B b96fbafdc71fa0c820f59af5ad1c3fe0e9efc906 B b97158ac58e515d56988af0676f309e6ea74d604 @@ -1130,6 +1134,7 @@ B fc97f90c306db66b88b1055cc4407a52243e5561 B fd02dad09d7f6bc6aeab653c100f802d909dff7e B fd4954169cda9f3df5f0200f8f892c40c6c9ac98 B fd543c398a25cc0babd0ff0799fbb757cde39dee +B fdd9c970719cb73084dc442068658d53641d05b2 B fe3049201ca1271ae6d7f0e5a54bb0836a719f62 B fe6e0e04c0d883a3480f4d5c7d24339e6b2dbf6b B fe740d44bcd08234ac90c9ff64b7f13fed5dae56 @@ -1228,6 +1233,7 @@ M 34e11ae3abe5c95c27cfdb2c089cc9d48936edf7 M 355c4d8b1ddad74fd209f31630e6e93e15168870 M 35a4abda4b235632b75b40879f71d8a1d27f4fcc M 364fba1ae623619c537ecaca1b9de8013b1c0d68 +M 36b1517adb23005f30407aa45320c3956786198d M 379524376276a740503afdf96aa1fd8ce6b56d0f M 38b67b00134f227561f9185a28d105e055e7a0f0 M 39e481039d93d9d875cc4bfead535ee277901f4a