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/3ce7f9ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3ce7f9ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3ce7f9ff Branch: refs/heads/master Commit: 3ce7f9fff7ffcc9e6f7d153a91d04c397fc22ff7 Parents: 44719b7 6fdb077 Author: Lahiru Sandaruwan <[email protected]> Authored: Sun Jan 19 00:04:50 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Sun Jan 19 00:04:50 2014 +0530 ---------------------------------------------------------------------- .../listener/InstanceStatusListener.java | 2 +- .../manager/lookup/ClusterIdToSubscription.java | 5 +- .../manager/lookup/LookupDataHolder.java | 11 +- .../manager/lookup/SubscriptionContext.java | 7 +- .../lookup/TenantIdToSubscriptionContext.java | 2 +- .../manager/CartridgeSubscriptionManager.java | 6 +- .../DatabaseBasedPersistenceManager.java | 2 +- .../manager/persistence/PersistenceManager.java | 4 +- .../RegistryBasedPersistenceManager.java | 4 +- .../DataInsertionAndRetrievalManager.java | 51 +++- .../service/ApplicationManagementService.java | 2 +- .../StratosManagerTopologyReceiver.java | 2 +- .../manager/test/CartridgeSubscriptionTest.java | 72 +++-- .../manager/test/LookupDataHolderTest.java | 282 +++++++++++++++++++ .../stratos/manager/test/PolicyHolderTest.java | 168 +++++------ 15 files changed, 488 insertions(+), 132 deletions(-) ----------------------------------------------------------------------
