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/961dfd37 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/961dfd37 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/961dfd37 Branch: refs/heads/2_0_X Commit: 961dfd372313151ef6a85bb96d2e4dbe01ab9f02 Parents: 49ad3c7 8d270a1 Author: Francesco Chicchiriccò <[email protected]> Authored: Wed Jan 21 06:29:13 2015 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Wed Jan 21 06:29:13 2015 +0100 ---------------------------------------------------------------------- .../syncope/core/util/ContentExporter.java | 9 ++- .../core/rest/ConfigurationTestITCase.java | 62 ++++++++++++++++++++ pom.xml | 2 +- 3 files changed, 71 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/961dfd37/pom.xml ----------------------------------------------------------------------
