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 47D728BF2 for ; Wed, 24 Aug 2011 15:38:05 +0000 (UTC) Received: (qmail 71750 invoked by uid 500); 24 Aug 2011 15:38:04 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 71639 invoked by uid 500); 24 Aug 2011 15:38:04 -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 71630 invoked by uid 99); 24 Aug 2011 15:38:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Aug 2011 15:38:04 +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; Wed, 24 Aug 2011 15:38:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 01EC523889E5 for ; Wed, 24 Aug 2011 15:37:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1161161 - /cxf/branches/2.3.x-fixes/ Date: Wed, 24 Aug 2011 15:37:40 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110824153741.01EC523889E5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Aug 24 15:37:40 2011 New Revision: 1161161 URL: http://svn.apache.org/viewvc?rev=1161161&view=rev Log: Blocked revisions 1161144,1161158 via svnmerge ................ r1161144 | coheigea | 2011-08-24 11:12:05 -0400 (Wed, 24 Aug 2011) | 1 line [CXF-3761] - STSClient can't process EncryptedKey elements received from an STS ................ r1161158 | dkulp | 2011-08-24 11:32:36 -0400 (Wed, 24 Aug 2011) | 9 lines Recorded merge of revisions 1161154 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1161154 | coheigea | 2011-08-24 11:29:26 -0400 (Wed, 24 Aug 2011) | 1 line [CXF-3761] - STSClient can't process EncryptedKey elements received from an STS ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.