Merge branch 'master' of https://github.com/gayangunarathne/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4c864974 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4c864974 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4c864974 Branch: refs/heads/master Commit: 4c86497432e95bc5b069f196b86d6f51077c5d31 Parents: 5e7835d b986ec4 Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Dec 5 12:15:12 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Dec 5 12:15:12 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/domain/Cartridge.java | 9 + .../cloud/controller/domain/CartridgeInfo.java | 10 + .../controller/util/CloudControllerUtil.java | 1 + .../apache/stratos/manager/dto/Cartridge.java | 210 +- .../rest/endpoint/api/StratosApiV41.java | 12 + .../rest/endpoint/api/StratosApiV41Utils.java | 85 + .../AverageInFlightRequestsFinder.xml | 2 +- .../main/resources/CloudControllerService.wsdl | 2244 +++++++++--------- 8 files changed, 1401 insertions(+), 1172 deletions(-) ----------------------------------------------------------------------
