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/e3fc2263 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e3fc2263 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e3fc2263 Branch: refs/heads/2_0_NO_JAXB Commit: e3fc2263408dff9992529d14deb3b387b66358ac Parents: 46e642e f97d4fd Author: fmartelli <[email protected]> Authored: Fri Jul 8 13:20:46 2016 +0200 Committer: fmartelli <[email protected]> Committed: Fri Jul 8 13:20:46 2016 +0200 ---------------------------------------------------------------------- .../src/main/resources/domains/MasterContent.xml | 4 ++-- .../src/test/resources/domains/MasterContent.xml | 6 +++--- .../src/test/resources/domains/TwoContent.xml | 4 ++-- .../core/provisioning/java/utils/ConnObjectUtils.java | 2 +- .../syncope/core/provisioning/java/utils/TemplateUtils.java | 9 +++++---- .../provisioning-camel/src/main/resources/userRoutes.xml | 4 ++-- fit/build-tools/src/main/resources/content.ldif | 1 + .../java/org/apache/syncope/fit/core/PullTaskITCase.java | 8 +++++++- 8 files changed, 23 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
