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 EEAC7116E9 for ; Mon, 16 Jun 2014 13:15:29 +0000 (UTC) Received: (qmail 21105 invoked by uid 500); 16 Jun 2014 13:15:29 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 21041 invoked by uid 500); 16 Jun 2014 13:15: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 21024 invoked by uid 99); 16 Jun 2014 13:15:29 -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, 16 Jun 2014 13:15:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 189E9940225; Mon, 16 Jun 2014 13:15:29 +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 Date: Mon, 16 Jun 2014 13:15:29 -0000 Message-Id: <427426c69aca4deea1468c7dd63d8707@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Recording .gitmergeinfo Changes Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 3a96429f6 -> 9884c8e29 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/c8de240e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c8de240e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c8de240e Branch: refs/heads/2.7.x-fixes Commit: c8de240ed80ee8fa95bbfb6667d86478a72e6b0d Parents: 591f949 Author: Colm O hEigeartaigh Authored: Mon Jun 16 12:12:58 2014 +0100 Committer: Colm O hEigeartaigh Committed: Mon Jun 16 12:12:58 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c8de240e/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index c97d41c..0d0c384 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -42,6 +42,7 @@ B 07c97db7b2254096156240a98762af0a51808be1 B 07ea01d2707936d9e7f5a205d327238b37ac819b B 080bd762e7e09f7fe1d1fa2d7c55bc6626f539d9 B 0877b2a7bfc496b6d8d57083abbee2fbfd50c221 +B 08f29acf03e6aa1b227bf4c12b1c76c64d31c625 B 0918a1bc99d40bc7fb3079570380b2b3094cae6b B 0919edd76e4909f06216c546628a6f7d586479b2 B 0946fd921cca26b62812a8e91620b1fe1237daf1 @@ -588,6 +589,7 @@ B 820b2468e2b55bbd2ba8366121aa041c4cc6f38e B 8210839483dad6dc7021520baae7f5f3f5c55557 B 822012675021b70aac4d56e9c5e1a9fd8bfe87bd B 8254d79be898f4b1e8bdc24ed3465a0a7a3b9ac2 +B 82606afa235a9b50544017ac91028093c92788a9 B 82774ce60cc8fc708fad3239975151157a56ffc3 B 82b3dbac1454207399520935759560ed51639091 B 82b48aa2209d58a3a9fc33cf3a30421ac4801111 @@ -653,6 +655,7 @@ B 901d2a520b71479151032ffe8b662c6b19dea3f8 B 90271b287605b558eb6beb6797e97d041e4dfb59 B 902a89c5a404d0a541af92a99ec223a7adc18619 B 902eaae78a838e2e5aabc0a082418bd2b6b55610 +B 90404af4e86e252c7e8724a282eb6190fe9e273f B 905487796650f6e5ecea37bb3790a599d5f75387 B 90ab5afdd29f5daef5af01453cdaa4f40ef099bf B 90c163306e79d9f2d38c094ac6b8996fc7c62bcc @@ -1516,6 +1519,7 @@ M aaa3c63bf37240ea52a3c89a0f1c69e9824376a0 M ac0cb8fce9a8145b6c1ba0d3f6b0cd2f6ab7a183 M ac22376d18e8d202026882f8d51de202d62974b8 M ac24b66124844cb577e18c0659fdb1d69c496654 +M ad4e3dde6751873629b024dd8c0327f9ed21404c M adc6a4666165dfa5d4c5b25e02a06dabe64084cf M add1748d867d7d2841cee5b8892cd924eccd763e M ae9468de2c91817cdfd0046ea22509dc6e47c8a7