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 A982BDE7F for ; Thu, 12 Jul 2012 14:29:29 +0000 (UTC) Received: (qmail 15681 invoked by uid 500); 12 Jul 2012 14:29:29 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 15638 invoked by uid 500); 12 Jul 2012 14:29: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 15622 invoked by uid 99); 12 Jul 2012 14:29:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jul 2012 14:29:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jul 2012 14:29:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2C4A82388B56; Thu, 12 Jul 2012 14:29:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1360703 - /cxf/branches/2.5.x-fixes/ Date: Thu, 12 Jul 2012 14:29:09 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120712142909.2C4A82388B56@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Jul 12 14:29:08 2012 New Revision: 1360703 URL: http://svn.apache.org/viewvc?rev=1360703&view=rev Log: Blocking revisions 1360195,1360266,1360268,1360680 via git from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1360195 | dkulp | 2012-07-11 10:29:23 -0400 (Wed, 11 Jul 2012) | 3 lines Recording revisions 1357091,1360188,1360189 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ ........ r1360266 | dkulp | 2012-07-11 12:19:54 -0400 (Wed, 11 Jul 2012) | 10 lines Merged revisions 1360262 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1360262 | dkulp | 2012-07-11 12:17:06 -0400 (Wed, 11 Jul 2012) | 2 lines [CXF-4417] add settings for async control to osgi settings ........ ........ ........ r1360268 | dkulp | 2012-07-11 12:19:59 -0400 (Wed, 11 Jul 2012) | 3 lines Recording revisions 1360262 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ ........ r1360680 | dkulp | 2012-07-12 09:47:55 -0400 (Thu, 12 Jul 2012) | 3 lines Recording revisions 1360401,1360402,1360403,1360404,1360405,1360406,1360644 via git from https://svn.apache.org/repos/asf/cxf/trunk ........ Modified: cxf/branches/2.5.x-fixes/ (props changed) Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.