Merge branch '4.0.0' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e1c15c4e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e1c15c4e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e1c15c4e Branch: refs/heads/4.0.0 Commit: e1c15c4e986e7358fef5ea1a2c03a4459bcc14a0 Parents: 07965e5 37372c2 Author: Manula Thantriwatte <[email protected]> Authored: Tue Jul 8 03:55:25 2014 +0000 Committer: Manula Thantriwatte <[email protected]> Committed: Tue Jul 8 03:55:25 2014 +0000 ---------------------------------------------------------------------- .../balancer/extension/api/LoadBalancerExtension.java | 13 ++++++++----- .../org/apache/stratos/haproxy/extension/HAProxy.java | 3 +++ .../stratos/haproxy/extension/HAProxyConfigWriter.java | 5 +++++ .../haproxy/extension/HAProxyStatisticsReader.java | 5 +++-- 4 files changed, 19 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
