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 23C8B9685 for ; Mon, 6 Feb 2012 22:16:19 +0000 (UTC) Received: (qmail 36175 invoked by uid 500); 6 Feb 2012 22:16:19 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 36073 invoked by uid 500); 6 Feb 2012 22:16:18 -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 36066 invoked by uid 99); 6 Feb 2012 22:16:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Feb 2012 22:16:18 +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; Mon, 06 Feb 2012 22:16:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 95EC82388BA2 for ; Mon, 6 Feb 2012 22:15:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1241216 - /cxf/branches/2.4.x-fixes/ Date: Mon, 06 Feb 2012 22:15:57 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120206221557.95EC82388BA2@eris.apache.org> Author: dkulp Date: Mon Feb 6 22:15:57 2012 New Revision: 1241216 URL: http://svn.apache.org/viewvc?rev=1241216&view=rev Log: Recorded merge of revisions 1236651 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1236651 | coheigea | 2012-01-27 07:25:56 -0500 (Fri, 27 Jan 2012) | 1 line Enforcing that only one Timestamp is allowed per security header ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available.