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/263e2f75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/263e2f75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/263e2f75 Branch: refs/heads/master Commit: 263e2f75c8e88b73e0bf410dec13abc69a605da0 Parents: 3ac05f5 9b1bd2c Author: Sajith Kariyawasam <[email protected]> Authored: Wed Feb 5 18:56:36 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Wed Feb 5 18:56:36 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/PartitionContext.java | 45 +- .../cloud/controller/CloudControllerClient.java | 2 +- .../controller/InstanceNotificationClient.java | 2 +- .../stratos/autoscaler/util/ConfUtil.java | 20 +- .../stratos/autoscaler/TestMinimumRule.java | 14 +- .../autoscaler/TestObsoletedMemberRule.java | 20 +- .../src/test/resources/autoscaler.xml | 43 ++ .../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/autoscaler.xml | 35 +- .../distribution/src/main/resources/stratos.bat | 2 +- .../distribution/src/main/resources/stratos.sh | 1 - tools/stratos-installer/conf/setup.conf | 2 +- tools/stratos-installer/resources/mysql.sql | 485 +++++++++++++++++++ tools/stratos-installer/setup.sh | 33 +- 18 files changed, 666 insertions(+), 109 deletions(-) ----------------------------------------------------------------------
