Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into topology_mgr
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c66b090f Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c66b090f Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c66b090f Branch: refs/heads/master Commit: c66b090f97882b83b9fc24f3709e4a204016af98 Parents: 2d20166 2fbd0fd Author: Isuru <[email protected]> Authored: Sun Dec 8 10:19:58 2013 +0530 Committer: Isuru <[email protected]> Committed: Sun Dec 8 10:19:58 2013 +0530 ---------------------------------------------------------------------- .../mgt/publisher/TenantSynzhronizerTask.java | 26 ++++- .../balancer/LoadBalancerTenantReceiver.java | 105 +++++++++++-------- .../balancer/LoadBalancerTopologyReceiver.java | 64 ++--------- .../stratos/load/balancer/RequestDelegator.java | 14 +-- .../conf/LoadBalancerConfiguration.java | 17 +-- .../context/LoadBalancerContextUtil.java | 73 +++++++++++++ .../sample/configuration/loadbalancer2.conf | 4 +- .../stratos/messaging/domain/tenant/Tenant.java | 5 + .../distribution/src/main/conf/log4j.properties | 2 +- 9 files changed, 192 insertions(+), 118 deletions(-) ----------------------------------------------------------------------
