You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/21 16:13:34 UTC
[07/23] stratos git commit: Merge branch 'master' of
https://github.com/apache/stratos
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/5757f1e1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5757f1e1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5757f1e1
Branch: refs/heads/master
Commit: 5757f1e1eb338f760fee2f5337090cea1db75fa9
Parents: de1f661 1465912
Author: Dinithi <di...@wso2.com>
Authored: Tue May 19 19:34:03 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Tue May 19 19:34:03 2015 +0530
----------------------------------------------------------------------
.../applications/topic/ApplicationBuilder.java | 13 +-
...ApplicationLevelNetworkPartitionContext.java | 263 -------------
.../GroupLevelNetworkPartitionContext.java | 390 -------------------
.../ParentLevelNetworkPartitionContext.java | 390 +++++++++++++++++++
.../monitor/component/ApplicationMonitor.java | 16 +-
.../monitor/component/GroupMonitor.java | 144 +++----
.../component/ParentComponentMonitor.java | 6 +-
.../services/impl/AutoscalerServiceImpl.java | 32 +-
.../stratos/autoscaler/util/AutoscalerUtil.java | 6 +-
.../stratos/cli/RestCommandLineService.java | 8 +-
.../common/client/AutoscalerServiceClient.java | 3 +-
.../console/configure_form.jag | 6 +-
.../configure/configure_requests.jag | 6 +-
.../default/configure/cartridgegroups.json | 9 +
.../forms/default/configure/groups.json | 9 -
.../forms/schema/configure/cartridgegroups.json | 46 +++
.../forms/schema/configure/groups.json | 46 ---
.../console/controllers/menu/menu.json | 2 +-
.../js/custom/applications_group_editor.js | 2 +-
.../themes/theme0/partials/configure_form.hbs | 10 +-
.../rest/endpoint/api/StratosApiV41.java | 21 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 11 +-
.../util/converter/ObjectConverter.java | 7 +-
23 files changed, 615 insertions(+), 831 deletions(-)
----------------------------------------------------------------------