You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@syncope.apache.org by il...@apache.org on 2015/01/08 10:49:12 UTC

[3/3] syncope git commit: Merge branch 'master' into 2_0_X

Merge branch 'master' into 2_0_X


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/fc8761c3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/fc8761c3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/fc8761c3

Branch: refs/heads/2_0_X
Commit: fc8761c33fd8bc9aebd77ff48516b94d981db4f4
Parents: 252eef6 a8f98d2
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Jan 8 10:48:52 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Jan 8 10:48:52 2015 +0100

----------------------------------------------------------------------
 .../org/apache/syncope/common/to/RouteTO.java   |  15 ++-
 .../DefaultRoleProvisioningManager.java         |  30 +++---
 .../DefaultUserProvisioningManager.java         | 102 +++++++------------
 .../core/provisioning/ProvisioningManager.java  |  12 +--
 .../provisioning/RoleProvisioningManager.java   |  34 ++++---
 .../provisioning/UserProvisioningManager.java   |  52 +++++-----
 .../camel/CamelRoleProvisioningManager.java     |   2 +-
 .../camel/CamelUserProvisioningManager.java     |   2 +-
 .../core/sync/impl/RoleSyncResultHandler.java   |   2 +-
 .../core/sync/impl/UserSyncResultHandler.java   |   2 +-
 10 files changed, 113 insertions(+), 140 deletions(-)
----------------------------------------------------------------------