You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2013/12/11 09:32:00 UTC

[08/21] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

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/f3ffe891
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f3ffe891
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f3ffe891

Branch: refs/heads/master
Commit: f3ffe891ce7a7eadc9ece8f2193a5f444ee96593
Parents: 9efacf8 19fc9f8
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Mon Dec 9 17:46:00 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Mon Dec 9 17:46:00 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 +++++
 .../src/main/resources/AutoScalerService.wsdl   | 455 ++++++++++++++++++-
 10 files changed, 657 insertions(+), 287 deletions(-)
----------------------------------------------------------------------