Merge remote-tracking branch 'origin/docker-grouping-merge' into docker-grouping-merge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4b8fca04 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4b8fca04 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4b8fca04 Branch: refs/heads/docker-grouping-merge Commit: 4b8fca0473f93b5425d9a70b5a6c49b5e692cd1b Parents: 69bfb27 2fd38c3 Author: Imesh Gunaratne <[email protected]> Authored: Tue Nov 4 16:41:40 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Nov 4 16:41:40 2014 +0530 ---------------------------------------------------------------------- .../java/org/apache/stratos/manager/deploy/service/Service.java | 2 +- .../stratos/manager/deploy/service/ServiceDeploymentManager.java | 4 ++-- .../manager/deploy/service/multitenant/lb/DefaultLBService.java | 2 +- .../manager/deploy/service/multitenant/lb/ExistingLBService.java | 2 +- .../stratos/manager/deploy/service/multitenant/lb/LBService.java | 2 +- .../deploy/service/multitenant/lb/MultiTenantLBService.java | 2 +- .../deploy/service/multitenant/lb/ServiceAwareLBService.java | 2 +- .../org/apache/stratos/manager/lb/category/LBDataContext.java | 4 ++-- .../subscription/filter/LBCreationSubscriptionFilter.java | 4 ++-- .../manager/subscription/utils/CartridgeSubscriptionUtils.java | 2 -- 10 files changed, 12 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
