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/f46c9d2b Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f46c9d2b Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f46c9d2b Branch: refs/heads/master Commit: f46c9d2b6b0aef4076cf139ed53314c30f3ec403 Parents: dadbe68 6d6ed00 Author: rekathiru <[email protected]> Authored: Fri Jan 24 10:19:58 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Jan 24 10:19:58 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 | 2 +- .../distribution/src/main/bin/stratos.bat | 2 +- .../distribution/src/main/bin/stratos.sh | 1 + 9 files changed, 121 insertions(+), 143 deletions(-) ----------------------------------------------------------------------
