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/edcee032 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/edcee032 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/edcee032 Branch: refs/heads/master Commit: edcee03215639149f5b0f7b085ca63765924b49e Parents: a2719b4 395636f Author: Isuru <[email protected]> Authored: Wed Jan 15 12:22:38 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Jan 15 12:22:38 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 7 + .../stratos/autoscaler/PartitionContext.java | 144 ++++++++++++---- .../autoscaler/algorithm/OneAfterAnother.java | 6 +- .../autoscaler/algorithm/RoundRobin.java | 6 +- .../cloud/controller/CloudControllerClient.java | 2 +- .../health/AutoscalerHealthStatReceiver.java | 12 +- .../topology/AutoscalerTopologyReceiver.java | 27 ++- .../autoscaler/rule/RuleTasksDelegator.java | 8 +- .../stratos/autoscaler/util/AutoscalerUtil.java | 8 +- .../stratos/autoscaler/TestMinimumRule.java | 2 +- .../cloud/controller/iaases/AWSEC2Iaas.java | 17 ++ .../controller/iaases/OpenstackNovaIaas.java | 9 + .../cloud/controller/iaases/VCloudIaas.java | 9 + .../impl/CloudControllerServiceImpl.java | 46 +++-- .../cloud/controller/interfaces/Iaas.java | 5 + .../LoadBalancerStatisticsReader.java | 6 +- .../LoadBalancerStatisticsNotifier.java | 2 +- .../TenantAwareLoadBalanceEndpoint.java | 2 +- .../balancer/mediators/ResponseInterceptor.java | 2 +- .../LoadBalancerStatisticsCollector.java | 114 ++++++++---- .../stat/HealthStatEventMessageQueue.java | 2 +- .../InstanceNotifierEventMessageQueue.java | 2 +- .../tenant/TenantEventMessageQueue.java | 2 +- .../topology/TopologyEventMessageQueue.java | 2 +- .../receiver/topology/TopologyManager.java | 2 +- .../extension/HAProxyStatisticsReader.java | 2 +- .../distribution/src/main/conf/scaling.drl | 2 +- .../distribution/src/main/conf/terminateall.drl | 2 +- .../stratos-manager/conf/sso-idp-config.xml | 59 ++++--- .../org.wso2.store.sso.common_1.0.0.jar | Bin 0 -> 13957 bytes ...so2.stratos.identity.saml2.sso.mgt_2.2.0.jar | Bin 0 -> 12276 bytes .../conf/temp-artifacts/sso/module.xml | 6 + .../temp-artifacts/sso/scripts/sso.client.js | 172 +++++++++++++++++++ .../modules/distribution/src/assembly/bin.xml | 20 +++ 34 files changed, 552 insertions(+), 155 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/edcee032/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java ----------------------------------------------------------------------
