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/dc3ae376 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/dc3ae376 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/dc3ae376 Branch: refs/heads/master Commit: dc3ae376ab6fbbba056a317e2654e2db4e1c566b Parents: 4a6034e 0e111bb Author: Melan Nimesh <[email protected]> Authored: Sat Jan 25 09:41:35 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Sat Jan 25 09:41:35 2014 +0530 ---------------------------------------------------------------------- .../git/impl/GitBasedArtifactRepository.java | 14 +- .../stratos/manager/deploy/service/Service.java | 3 +- .../service/ServiceDeploymentManager.java | 226 ++++++++----------- .../service/multitenant/MultiTenantService.java | 7 +- .../multitenant/lb/MultiTenantLBService.java | 7 +- .../tenancy/SubscriptionTenancyBehaviour.java | 2 +- .../rest/endpoint/services/ServiceUtils.java | 33 ++- .../extension/FaultHandlingWindowProcessor.java | 2 +- 8 files changed, 144 insertions(+), 150 deletions(-) ----------------------------------------------------------------------
