Resolving conflicts of AS wsdl.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e4ec3ee4 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e4ec3ee4 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e4ec3ee4 Branch: refs/heads/master Commit: e4ec3ee4aeccbd0c921ca9bdfed804dc3317f14e Parents: 8410280 Author: Nirmal Fernando <[email protected]> Authored: Mon Dec 1 17:58:47 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Mon Dec 1 17:58:47 2014 +0530 ---------------------------------------------------------------------- .../src/main/resources/AutoScalerService.wsdl | 1489 +++++++++--------- 1 file changed, 707 insertions(+), 782 deletions(-) ----------------------------------------------------------------------
