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/0d97f451 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0d97f451 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0d97f451 Branch: refs/heads/master Commit: 0d97f451542c42665a10c8e5ec2a07212d3163e8 Parents: 4715ef1 7a7d415 Author: Matteo Di Carlo <matteo.dica...@tirasa.net> Authored: Wed Sep 7 15:15:31 2016 +0200 Committer: Matteo Di Carlo <matteo.dica...@tirasa.net> Committed: Wed Sep 7 15:15:31 2016 +0200 ---------------------------------------------------------------------- .../syncope/core/logic/CamelRouteLogic.java | 14 +++++- .../camel/AbstractCamelProvisioningManager.java | 14 +++--- .../core/provisioning/camel/CamelException.java | 32 +++++++++++++ .../provisioning/camel/SyncopeCamelContext.java | 47 +++++++++++++------- pom.xml | 4 ++ 5 files changed, 85 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
