You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2014/12/04 13:50:04 UTC
[5/5] stratos git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/86530242
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/86530242
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/86530242
Branch: refs/heads/master
Commit: 86530242c29990d650b66387f6811781b7ea1b19
Parents: f58c585 707f111
Author: sajhak <sa...@gmail.com>
Authored: Thu Dec 4 18:09:54 2014 +0530
Committer: sajhak <sa...@gmail.com>
Committed: Thu Dec 4 18:09:54 2014 +0530
----------------------------------------------------------------------
.../applications/topic/ApplicationBuilder.java | 15 +-
.../client/CloudControllerClient.java | 3 +-
.../context/cluster/ClusterContextFactory.java | 8 +-
.../context/cluster/ClusterInstanceContext.java | 43 +---
.../context/cluster/VMClusterContext.java | 181 ++++++++---------
.../partition/ClusterLevelPartitionContext.java | 203 +++++++++----------
.../partition/GroupLevelPartitionContext.java | 4 +-
.../context/partition/PartitionContext.java | 20 +-
.../AutoscalerTopologyEventReceiver.java | 2 +
.../autoscaler/monitor/MonitorFactory.java | 84 ++++----
.../monitor/cluster/VMClusterMonitor.java | 169 ++++++++-------
.../monitor/component/ApplicationMonitor.java | 129 +++++++-----
.../autoscaler/rule/RuleTasksDelegator.java | 2 +-
.../domain/applications/Application.java | 33 ++-
.../src/main/conf/drools/scaling.drl | 4 +-
15 files changed, 437 insertions(+), 463 deletions(-)
----------------------------------------------------------------------