Merge branch 'lb_service_deployment'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/4c027278 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4c027278 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4c027278 Branch: refs/heads/master Commit: 4c027278ff3b800f4a8f30f505f7e4c48422ae13 Parents: 8a76a55 192c867 Author: Isuru <[email protected]> Authored: Fri Jan 10 11:31:58 2014 +0530 Committer: Isuru <[email protected]> Committed: Fri Jan 10 11:31:58 2014 +0530 ---------------------------------------------------------------------- .../stratos/manager/deploy/service/Service.java | 37 ++++++++++- .../service/ServiceDeploymentManager.java | 65 ++++++++++---------- .../service/multitenant/MultiTenantService.java | 2 + .../multitenant/lb/MultiTenantLBService.java | 54 ++++++++++++++++ 4 files changed, 126 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
