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/301d865c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/301d865c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/301d865c Branch: refs/heads/master Commit: 301d865c381d0351368df1541cb51c83d11c77b2 Parents: ecbd076 7eff3e8 Author: Melan Nimesh <[email protected]> Authored: Thu Feb 27 14:09:03 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Thu Feb 27 14:09:03 2014 +0530 ---------------------------------------------------------------------- .../TenantAwareLoadBalanceEndpoint.java | 7 +- .../balancer/mediators/ResponseInterceptor.java | 22 +-- .../InFlightRequestDecrementCallable.java | 38 +++++ .../InFlightRequestIncrementCallable.java | 38 +++++ .../LoadBalancerStatisticsCollector.java | 159 ++++++++----------- .../LoadBalancerStatisticsExecutor.java | 56 +++++++ .../theme1/partials/subscribe_cartridge.hbs | 95 ++++++----- .../stratos/rest/endpoint/mock/MockContext.java | 102 +++++++++--- .../rest/endpoint/mock/StratosTestAdmin.java | 23 ++- 9 files changed, 365 insertions(+), 175 deletions(-) ----------------------------------------------------------------------
