Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/85896131 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/85896131 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/85896131 Branch: refs/heads/master Commit: 858961317b15f6b89273acf871b2d3fd1ae6cc92 Parents: a9c641a efe5aac Author: Dinithi <[email protected]> Authored: Tue May 19 18:05:48 2015 +0530 Committer: Dinithi <[email protected]> Committed: Tue May 19 18:05:48 2015 +0530 ---------------------------------------------------------------------- .../applications/topic/ApplicationBuilder.java | 8 +- ...ApplicationLevelNetworkPartitionContext.java | 178 ++++++++ .../GroupLevelNetworkPartitionContext.java | 177 +++++++- .../network/NetworkPartitionContext.java | 173 +------- .../stratos/autoscaler/monitor/Monitor.java | 2 +- .../monitor/cluster/ClusterMonitor.java | 23 +- .../monitor/component/ApplicationMonitor.java | 123 +++--- .../monitor/component/GroupMonitor.java | 61 +-- .../autoscaler/pojo/policy/PolicyManager.java | 10 +- .../stratos/autoscaler/util/AutoscalerUtil.java | 34 +- .../services/CloudControllerService.java | 9 + .../impl/CloudControllerServiceImpl.java | 34 ++ .../common/beans/cartridge/CartridgeBean.java | 10 + .../beans/kubernetes/KubernetesMasterBean.java | 8 - .../client/CloudControllerServiceClient.java | 6 + .../configure/configure_requests.jag | 6 + .../forms/default/configure/cartridges.json | 1 + .../forms/schema/configure/cartridges.json | 17 +- .../console/controllers/menu/menu.json | 31 +- .../console/controllers/rest/rest_calls.jag | 8 + .../themes/theme0/partials/configure_form.hbs | 6 + .../rest/endpoint/api/StratosApiV41.java | 40 +- .../rest/endpoint/api/StratosApiV41Utils.java | 26 ++ .../util/converter/ObjectConverter.java | 11 +- .../main/resources/CloudControllerService.wsdl | 424 +++++++++++-------- 25 files changed, 908 insertions(+), 518 deletions(-) ----------------------------------------------------------------------
