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 167696592 for ; Wed, 27 Jul 2011 17:54:51 +0000 (UTC) Received: (qmail 18858 invoked by uid 500); 27 Jul 2011 17:54:50 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 18750 invoked by uid 500); 27 Jul 2011 17:54:49 -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 18743 invoked by uid 99); 27 Jul 2011 17:54:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jul 2011 17:54:49 +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, 27 Jul 2011 17:54:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 94F6A23889BB for ; Wed, 27 Jul 2011 17:54:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1151561 - /cxf/branches/2.4.x-fixes/ Date: Wed, 27 Jul 2011 17:54:28 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110727175428.94F6A23889BB@eris.apache.org> Author: dkulp Date: Wed Jul 27 17:54:28 2011 New Revision: 1151561 URL: http://svn.apache.org/viewvc?rev=1151561&view=rev Log: Recorded merge of revisions 1151132-1151133,1151512 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1151132 | coheigea | 2011-07-26 11:19:41 -0400 (Tue, 26 Jul 2011) | 1 line Setting clone of SecurityTokenReference correctly. ........ r1151133 | coheigea | 2011-07-26 11:20:00 -0400 (Tue, 26 Jul 2011) | 1 line Import the BinarySecurity element to prevent signature validation failure. ........ r1151512 | coheigea | 2011-07-27 11:57:51 -0400 (Wed, 27 Jul 2011) | 1 line [CXF-3674] - Changed to use an InterceptorProvider for the Kerberos client case. ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available.