Merge branch '1_2_X' of https://git-wip-us.apache.org/repos/asf/syncope into 1_2_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/56f15980 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/56f15980 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/56f15980 Branch: refs/heads/1_2_X Commit: 56f159808c863507792752e9fd637d345d481dc1 Parents: 503097d fb57753 Author: Francesco Chicchiriccò <[email protected]> Authored: Mon Oct 19 16:36:33 2015 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Mon Oct 19 16:36:33 2015 +0200 ---------------------------------------------------------------------- .../core/persistence/dao/impl/SubjectSearchDAOImpl.java | 11 ++++++++--- .../apache/syncope/core/services/RoleServiceImpl.java | 11 ++++++++--- .../org/apache/syncope/core/rest/SearchTestITCase.java | 9 +++++++++ 3 files changed, 25 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
