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/e5d7e1fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e5d7e1fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e5d7e1fd Branch: refs/heads/master Commit: e5d7e1fd3febc4df3332bd3b371ea7aac3170ff5 Parents: d7208b9 101a4ec Author: Pradeep Fernando <[email protected]> Authored: Thu Feb 6 09:55:12 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Thu Feb 6 09:55:12 2014 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 160 +++++++------------ .../stratos/cli/beans/cartridge/Cartridge.java | 9 ++ .../controller/topology/TopologyBuilder.java | 2 +- .../topology/TopologyEventPublisher.java | 5 +- .../conf/LoadBalancerConfiguration.java | 32 +++- .../load/balancer/conf/domain/MemberIpType.java | 31 ++++ .../balancer/conf/domain/TenantIdentifier.java | 19 +++ .../load/balancer/conf/util/Constants.java | 1 + .../TenantAwareLoadBalanceEndpoint.java | 41 ++++- .../sample/configuration/loadbalancer1.conf | 6 + .../sample/configuration/loadbalancer2.conf | 6 + .../sample/configuration/loadbalancer3.conf | 6 + .../model/TopologyClusterInformationModel.java | 3 +- .../StratosManagerTopologyReceiver.java | 39 +++++ .../broker/connect/TopicConnector.java | 2 + .../event/topology/InstanceSpawnedEvent.java | 19 +++ .../InstanceSpawnedMessageProcessor.java | 2 + .../stratos/messaging/util/Constants.java | 2 + .../rest/endpoint/services/StratosAdmin.java | 1 + .../load-balancer/haproxy-extension/INSTALL.txt | 19 ++- .../src/main/bin/haproxy-extension.sh | 7 +- .../stratos/haproxy/extension/Constants.java | 1 + .../haproxy/extension/HAProxyConfigWriter.java | 36 ++--- .../haproxy/extension/HAProxyContext.java | 8 + .../distribution/src/main/conf/mincheck.drl | 2 +- .../src/main/conf/loadbalancer.conf | 8 +- 26 files changed, 332 insertions(+), 135 deletions(-) ----------------------------------------------------------------------
