Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/47f406d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/47f406d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/47f406d6 Branch: refs/heads/master Commit: 47f406d6b2a4b79a6e8dd6b172d2f25cf337d73f Parents: f5769e6 5ad85be Author: Pradeep Fernando <[email protected]> Authored: Thu Jan 16 14:23:55 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Thu Jan 16 14:23:55 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 19 +++++--- .../stratos/autoscaler/PartitionContext.java | 29 ++++++------ .../autoscaler/algorithm/OneAfterAnother.java | 18 +++---- .../autoscaler/algorithm/RoundRobin.java | 49 +++++++++++--------- .../stratos/cli/commands/AddTenantCommand.java | 8 ++-- .../AutoscalingPolicyDeploymentCommand.java | 2 +- .../commands/CartridgeDeploymentCommand.java | 2 +- .../DeploymentPolicyDeploymentCommand.java | 2 +- .../commands/PartitionDeploymentCommand.java | 2 +- .../LoadBalancerStatisticsCollector.java | 36 ++++++++++---- .../distribution/src/main/conf/mincheck.drl | 4 +- 11 files changed, 98 insertions(+), 73 deletions(-) ----------------------------------------------------------------------
