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/cc922e65 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cc922e65 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cc922e65 Branch: refs/heads/2_0_X Commit: cc922e652cfa8b61772459819874c7b0d6fc80b0 Parents: 0430d83 3f4c758 Author: Francesco Chicchiriccò <[email protected]> Authored: Sat Jan 31 06:06:05 2015 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Sat Jan 31 06:06:05 2015 +0100 ---------------------------------------------------------------------- .../syncope/core/init/CamelRouteLoader.java | 59 ++++++++++---------- .../core/persistence/beans/CamelRoute.java | 5 +- 2 files changed, 32 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
