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/d70d558a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d70d558a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d70d558a Branch: refs/heads/master Commit: d70d558a5b6b6d0de7c7a88df93644169eb83fb8 Parents: 1d139d0 38ec685 Author: Udara Liyanage <[email protected]> Authored: Wed Mar 12 09:06:24 2014 -0400 Committer: Udara Liyanage <[email protected]> Committed: Wed Mar 12 09:06:24 2014 -0400 ---------------------------------------------------------------------- .../lb/category/LoadBalancerCategory.java | 86 +++ .../manager/CartridgeSubscriptionManager.java | 14 +- .../RegistryBasedPersistenceManager.java | 5 +- .../utils/CartridgeSubscriptionUtils.java | 4 +- .../model/TopologyClusterInformationModel.java | 554 ++++++------------- .../StratosManagerTopologyReceiver.java | 149 ++--- 6 files changed, 307 insertions(+), 505 deletions(-) ----------------------------------------------------------------------
