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/b8425091 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b8425091 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b8425091 Branch: refs/heads/master Commit: b8425091ef5caa7cc10b189ebc6a946bb200db88 Parents: b5f6982 4a5fd54 Author: Lahiru Sandaruwan <[email protected]> Authored: Fri Jan 10 12:00:05 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri Jan 10 12:00:05 2014 +0530 ---------------------------------------------------------------------- .../console/cartridges.jag | 5 +- .../console/index.jag | 5 +- .../console/util/utility.jag | 60 +++++++++--------- .../stratos/manager/deploy/service/Service.java | 37 ++++++++++- .../service/ServiceDeploymentManager.java | 65 ++++++++++---------- .../service/multitenant/MultiTenantService.java | 2 + .../multitenant/lb/MultiTenantLBService.java | 54 ++++++++++++++++ .../AverageInFlightRequestsEventFormatter.xml | 2 +- .../AverageLoadAverageEventFormatter.xml | 2 +- .../AverageMemoryConsumptionEventFormatter.xml | 2 +- .../FaultMessageEventFormatter.xml | 2 +- .../GradientInFlightRequestsEventFormatter.xml | 2 +- .../GradientLoadAverageEventFormatter.xml | 2 +- .../GradientMemoryConsumptionEventFormatter.xml | 2 +- .../MemberAverageLoadAverageEventFormatter.xml | 2 +- ...erAverageMemoryConsumptionEventFormatter.xml | 2 +- .../MemberGradientLoadAverageEventFormatter.xml | 2 +- ...rGradientMemoryConsumptionEventFormatter.xml | 2 +- ...econdDerivativeLoadAverageEventFormatter.xml | 2 +- ...erivativeMemoryConsumptionEventFormatter.xml | 2 +- ...DerivativeInFlightRequestsEventFormatter.xml | 2 +- ...econdDerivativeLoadAverageEventFormatter.xml | 2 +- ...erivativeMemoryConsumptionEventFormatter.xml | 2 +- 23 files changed, 180 insertions(+), 80 deletions(-) ----------------------------------------------------------------------
