You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/07/12 09:03:15 UTC
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e28aabd7
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e28aabd7
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e28aabd7
Branch: refs/heads/master
Commit: e28aabd7668800c3def395002f0547872ebe4555
Parents: c87a434 e97b95c
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sat Jul 12 12:32:44 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sat Jul 12 12:32:44 2014 +0530
----------------------------------------------------------------------
NOTICE | 2 +-
.../src/test/python/README.md | 6 +-
.../console/error.html | 2 +-
.../src/main/resources/META-INF/product.xml | 6 +-
.../haproxy/extension/HAProxyConfigWriter.java | 81 +++++++++++++++-----
.../extension/HAProxyStatisticsReader.java | 39 +++++-----
.../src/main/templates/haproxy.cfg.template | 9 ++-
pom.xml | 24 +++---
products/load-balancer/README.txt | 2 +-
products/stratos-cli/README.txt | 2 +-
tools/stratos-installer/README.txt | 2 +-
11 files changed, 109 insertions(+), 66 deletions(-)
----------------------------------------------------------------------