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/16984bda Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/16984bda Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/16984bda Branch: refs/heads/2_0_X Commit: 16984bdafb8572f7dd552a50d88e25f82e1f2e99 Parents: 59bd58c 87140e6 Author: Francesco Chicchiriccò <[email protected]> Authored: Mon Jan 26 16:08:20 2015 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Mon Jan 26 16:08:20 2015 +0100 ---------------------------------------------------------------------- .../org/apache/syncope/cli/SyncopeServices.java | 18 +++++++++++------- .../org/apache/syncope/cli/util/XmlUtils.java | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
