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 <[email protected]> Authored: Thu Feb 20 17:24:20 2014 +0000 Committer: Sergey Beryozkin <[email protected]> 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(-) ----------------------------------------------------------------------
