Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into rest_api
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/522db603 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/522db603 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/522db603 Branch: refs/heads/master Commit: 522db60338ac468ba7ccf122075c1c8b8a01f57c Parents: 5629d1d 19fc9f8 Author: Isuru <[email protected]> Authored: Mon Dec 9 20:59:30 2013 +0530 Committer: Isuru <[email protected]> Committed: Mon Dec 9 20:59:30 2013 +0530 ---------------------------------------------------------------------- .../autoscaler/policy/PolicyManager.java | 10 +- .../autoscaler/registry/RegistryManager.java | 2 +- .../rule/AutoscalerRuleEvaluator.java | 36 +++--- .../messaging/domain/topology/Cloud.java | 84 ------------- .../messaging/domain/topology/Cluster.java | 27 ---- .../messaging/domain/topology/Region.java | 79 ------------ .../stratos/messaging/domain/topology/Zone.java | 55 -------- .../ec2/load-balancer/start-load-balancer.sh | 70 +++++++++++ .../templates/loadbalancer.conf.template | 126 +++++++++++++++++++ 9 files changed, 224 insertions(+), 265 deletions(-) ----------------------------------------------------------------------
