You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/07/17 11:49:30 UTC
[6/6] git commit: Merge Grouping SM side changes Merge branch
'4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into
4.0.0-grouping
Merge Grouping SM side changes
Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8499edac
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8499edac
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8499edac
Branch: refs/heads/4.0.0-grouping
Commit: 8499edac484031dca34073bc6ca9ac8300b6fa62
Parents: 51ec31c 1fa2d66
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Thu Jul 17 15:18:29 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Thu Jul 17 15:18:29 2014 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/AutoscalerContext.java | 37 +-
.../autoscaler/ComplexApplicationContext.java | 38 +-
.../AutoscalerTopologyEventReceiver.java | 393 +++++++++++--------
.../autoscaler/monitor/AbstractMonitor.java | 145 ++++---
.../autoscaler/monitor/ClusterMonitor.java | 38 +-
.../monitor/CompositeApplicationMonitor.java | 254 ++++++++++++
.../autoscaler/monitor/LbClusterMonitor.java | 25 +-
.../messaging/domain/topology/Cartridge.java | 14 +-
.../domain/topology/CompositeApplication.java | 24 +-
.../util/CompositeApplicationBuilder.java | 18 +-
.../event/topology/MemberActivatedEvent.java | 13 +-
11 files changed, 681 insertions(+), 318 deletions(-)
----------------------------------------------------------------------