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/655042e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/655042e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/655042e1 Branch: refs/heads/master Commit: 655042e15a7e52b9d720d14c1f00d2d23e131a01 Parents: 216901d 263e2f7 Author: Isuru <[email protected]> Authored: Wed Feb 5 19:07:42 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Feb 5 19:07:42 2014 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 160 +++--- .../stratos/cli/beans/cartridge/Cartridge.java | 9 + .../controller/topology/TopologyBuilder.java | 2 +- .../topology/TopologyEventPublisher.java | 5 +- .../StratosManagerTopologyReceiver.java | 39 ++ .../event/topology/InstanceSpawnedEvent.java | 19 + .../InstanceSpawnedMessageProcessor.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 + tools/stratos-installer/conf/setup.conf | 2 +- tools/stratos-installer/resources/mysql.sql | 485 +++++++++++++++++++ tools/stratos-installer/setup.sh | 33 +- 16 files changed, 693 insertions(+), 135 deletions(-) ----------------------------------------------------------------------
