Merge branch 'docker-grouping-merge' of https://git-wip-us.apache.org/repos/asf/stratos into docker-grouping-merge-wip
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2c603d04 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2c603d04 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2c603d04 Branch: refs/heads/docker-grouping-merge Commit: 2c603d04768c753a73772ca0693488c2cf326f5e Parents: 4280eec 4d39532 Author: lasinducharith <[email protected]> Authored: Wed Nov 5 14:41:39 2014 +0530 Committer: lasinducharith <[email protected]> Committed: Wed Nov 5 14:41:39 2014 +0530 ---------------------------------------------------------------------- .../monitor/cluster/AbstractClusterMonitor.java | 22 +++++- .../KubernetesServiceClusterMonitor.java | 17 ++++- .../monitor/cluster/VMLbClusterMonitor.java | 8 ++- .../cluster/VMServiceClusterMonitor.java | 15 +++-- .../rule/AutoscalerRuleEvaluator.java | 70 +++++++++++++------- .../common/constants/StratosConstants.java | 2 + .../src/main/conf/drools/container-mincheck.drl | 19 ------ .../conf/drools/container-obsoletecheck.drl | 46 +++++++++++++ .../src/main/conf/drools/mincheck.drl | 14 ---- .../src/main/conf/drools/obsoletecheck.drl | 66 ++++++++++++++++++ 10 files changed, 211 insertions(+), 68 deletions(-) ----------------------------------------------------------------------
