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/527cd1c8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/527cd1c8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/527cd1c8 Branch: refs/heads/master Commit: 527cd1c811876f980fb23712af04437a02d9dc92 Parents: 0d29a38 d26570e Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Tue Mar 1 12:10:10 2016 +0000 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Tue Mar 1 12:10:10 2016 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java | 4 ++-- .../java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java | 2 +- .../apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------