Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos into PR-4
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/87fa8834 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/87fa8834 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/87fa8834 Branch: refs/heads/master Commit: 87fa88347b6b664ebe6472b6fb1a347620b0842e Parents: 7b50cd9 ed82585 Author: vagrant <[email protected]> Authored: Tue Jul 8 19:53:22 2014 +0000 Committer: vagrant <[email protected]> Committed: Tue Jul 8 19:53:22 2014 +0000 ---------------------------------------------------------------------- .../extension/api/LoadBalancerExtension.java | 13 +- .../rest/endpoint/services/StratosAdmin.java | 130 ++++++++++--------- .../stratos/haproxy/extension/HAProxy.java | 3 + .../haproxy/extension/HAProxyConfigWriter.java | 5 + .../extension/HAProxyStatisticsReader.java | 5 +- 5 files changed, 85 insertions(+), 71 deletions(-) ----------------------------------------------------------------------
