Merge branch '1_2_X'
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a1eead02 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a1eead02 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a1eead02 Branch: refs/heads/master Commit: a1eead02d2caa7ddf2218bc2d7fe8da97c5515e6 Parents: eca7585 7b1c5eb Author: giacomolm <[email protected]> Authored: Tue Jan 20 17:30:26 2015 +0100 Committer: giacomolm <[email protected]> Committed: Tue Jan 20 17:30:26 2015 +0100 ---------------------------------------------------------------------- .../syncope/core/util/ContentExporter.java | 9 ++- .../core/rest/ConfigurationTestITCase.java | 62 ++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
