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

Branch: refs/heads/master
Commit: d0f1a449a97746ae59673bb847fad8e807255614
Parents: 70a006d 9b1bd2c
Author: Nirmal Fernando <[email protected]>
Authored: Wed Feb 5 18:02:33 2014 +0530
Committer: Nirmal Fernando <[email protected]>
Committed: Wed Feb 5 18:02:33 2014 +0530

----------------------------------------------------------------------
 .../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 +-
 8 files changed, 556 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


Reply via email to