Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e3e57dfb Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e3e57dfb Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e3e57dfb Branch: refs/heads/master Commit: e3e57dfb95462da33bc07f6a5549f58157c86461 Parents: 4759d03 eb99e24 Author: fmartelli <[email protected]> Authored: Thu May 21 09:14:29 2015 +0200 Committer: fmartelli <[email protected]> Committed: Thu May 21 09:14:29 2015 +0200 ---------------------------------------------------------------------- .../core/logic/AbstractSubjectLogic.java | 40 +++++++++++------ .../apache/syncope/core/logic/UserLogic.java | 2 +- .../src/test/resources/content.xml | 10 ++++- .../core/provisioning/api/job/JobNamer.java | 4 +- .../java/job/SpringBeanJobFactory.java | 17 ------- .../core/reference/AuthenticationITCase.java | 47 +++++++++----------- .../fit/core/reference/UserWorkflowITCase.java | 2 +- pom.xml | 2 +- 8 files changed, 62 insertions(+), 62 deletions(-) ----------------------------------------------------------------------
