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 EDBBE11D89 for ; Thu, 20 Feb 2014 17:24:58 +0000 (UTC) Received: (qmail 35831 invoked by uid 500); 20 Feb 2014 17:24:54 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 35683 invoked by uid 500); 20 Feb 2014 17:24:53 -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 35257 invoked by uid 99); 20 Feb 2014 17:24:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Feb 2014 17:24:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 86382929B67; Thu, 20 Feb 2014 17:24:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Date: Thu, 20 Feb 2014 17:24:53 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2841fc7c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2841fc7c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2841fc7c Branch: refs/heads/master Commit: 2841fc7c25de8a38d4189c9f31f2f3cda2261be8 Parents: c4b5bf8 3085f0f Author: Sergey Beryozkin Authored: Thu Feb 20 17:24:20 2014 +0000 Committer: Sergey Beryozkin Committed: Thu Feb 20 17:24:20 2014 +0000 ---------------------------------------------------------------------- .../ws/policy/selector/BaseAlternativeSelector.java | 14 +++++++++----- .../org/apache/cxf/ws/security/wss4j/WSS4JUtils.java | 10 ++++++++-- .../cxf/systest/ws/algsuite/AlgorithmSuiteTest.java | 2 ++ 3 files changed, 19 insertions(+), 7 deletions(-) ----------------------------------------------------------------------