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/2526c456 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2526c456 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2526c456 Branch: refs/heads/2_0_NO_JAXB Commit: 2526c4564a90e439a0d9a4925eb7db9ce6f0f454 Parents: 1464939 1008416 Author: fmartelli <fabio.marte...@gmail.com> Authored: Wed Jul 13 11:02:30 2016 +0200 Committer: fmartelli <fabio.marte...@gmail.com> Committed: Wed Jul 13 11:02:30 2016 +0200 ---------------------------------------------------------------------- .../camel/processor/AnyObjectCreateProcessor.java | 2 +- .../camel/processor/AnyObjectUpdateProcessor.java | 2 +- .../camel/processor/GroupCreateInPullProcessor.java | 2 +- .../provisioning/camel/processor/GroupCreateProcessor.java | 2 +- .../provisioning/camel/processor/GroupUpdateProcessor.java | 6 +----- .../camel/processor/UserConfirmPwdResetProcessor.java | 3 ++- .../provisioning/camel/processor/UserCreateProcessor.java | 7 ++----- .../camel/processor/UserInternalSuspendProcessor.java | 3 ++- .../camel/processor/UserSetStatusInPullProcessor.java | 5 ++++- .../camel/processor/UserStatusPropagationProcessor.java | 2 +- .../camel/processor/UserUpdateInPullProcessor.java | 3 ++- .../provisioning/camel/processor/UserUpdateProcessor.java | 3 ++- 12 files changed, 20 insertions(+), 20 deletions(-) ----------------------------------------------------------------------