Resolving conflicts in wsdl
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0a25877d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0a25877d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0a25877d Branch: refs/heads/master Commit: 0a25877d9b679f9ffecac4be9aa1e0c75cd52a2e Parents: 0084709 Author: Vishanth <[email protected]> Authored: Thu May 14 12:26:37 2015 +0530 Committer: Vishanth <[email protected]> Committed: Thu May 14 12:26:37 2015 +0530 ---------------------------------------------------------------------- .../src/main/resources/AutoscalerService.wsdl | 1020 ++++-------------- 1 file changed, 233 insertions(+), 787 deletions(-) ----------------------------------------------------------------------
