Merge branch 'tenant-isolation-v1' of https://github.com/dinithis/stratos into tenant-isolation
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ea45f6cf Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ea45f6cf Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ea45f6cf Branch: refs/heads/tenant-isolation Commit: ea45f6cf741ee844cce823fc685d456c2291ba87 Parents: 16e1fe8 ea182b4 Author: Gayan Gunarathne <[email protected]> Authored: Fri Jul 17 18:18:04 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Fri Jul 17 18:18:04 2015 +0530 ---------------------------------------------------------------------- .../applications/pojo/CartridgeContext.java | 9 + .../autoscaler/pojo/policy/PolicyManager.java | 5 + .../autoscaler/services/AutoscalerService.java | 23 +- .../services/impl/AutoscalerServiceImpl.java | 42 +- .../beans/cartridge/CartridgeReferenceBean.java | 18 + .../common/client/AutoscalerServiceClient.java | 19 +- .../impl/StratosManagerServiceImpl.java | 4 +- .../rest/endpoint/api/StratosApiV41.java | 11 +- .../rest/endpoint/api/StratosApiV41Utils.java | 82 +- .../util/converter/ObjectConverter.java | 11 +- .../src/main/resources/AutoscalerService.wsdl | 414 ++++++---- .../main/resources/CloudControllerService.wsdl | 760 +++++++++---------- .../main/resources/StratosManagerService.wsdl | 198 ++--- 13 files changed, 893 insertions(+), 703 deletions(-) ----------------------------------------------------------------------
