You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2014/03/13 06:28:50 UTC
[2/4] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
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/ed016716
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ed016716
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ed016716
Branch: refs/heads/master
Commit: ed016716d7ce2a59cff244cd3a2b3adbfc0e2e1b
Parents: 7747702 d84622f
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Thu Mar 13 10:38:49 2014 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Thu Mar 13 10:38:49 2014 +0530
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 12 +-
.../apache/stratos/cli/StratosApplication.java | 6 +-
.../stratos/cli/beans/cartridge/Cartridge.java | 6 +-
.../stratos/cli/commands/CartridgesCommand.java | 67 ---
.../cli/commands/ListCartridgeInfoCommand.java | 127 -----
.../cli/commands/ListCartridgesCommand.java | 67 +++
.../stratos/cli/commands/ListCommand.java | 120 ----
.../ListSubscribedCartridgesCommand.java | 120 ++++
.../stratos/cli/commands/SubscribeCommand.java | 2 +-
.../SubscribedCartridgeInfoCommand.java | 127 +++++
.../lb/category/LoadBalancerCategory.java | 84 +++
.../manager/CartridgeSubscriptionManager.java | 27 +-
.../RegistryBasedPersistenceManager.java | 5 +-
.../manager/subscription/SubscriptionData.java | 9 -
.../utils/CartridgeSubscriptionUtils.java | 4 +-
.../model/TopologyClusterInformationModel.java | 554 ++++++-------------
.../StratosManagerTopologyReceiver.java | 149 ++---
.../rest/endpoint/services/ServiceUtils.java | 15 +-
18 files changed, 658 insertions(+), 843 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ed016716/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------