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/f0b70784 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f0b70784 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f0b70784 Branch: refs/heads/master Commit: f0b70784fa45f5d24a259cadc04013dad6165bdc Parents: 1f2f9d0 8997301 Author: Pradeep Fernando <[email protected]> Authored: Sun Jan 19 10:11:11 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Sun Jan 19 10:11:11 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/PartitionContext.java | 12 +- .../autoscaler/algorithm/OneAfterAnother.java | 20 +- .../autoscaler/algorithm/RoundRobin.java | 159 ++++++----- .../autoscaler/rule/RuleTasksDelegator.java | 8 +- .../stratos/cartridge/agent/CartridgeAgent.java | 2 + .../synchronizer/RepositoryInformation.java | 7 + .../git/impl/GitBasedArtifactRepository.java | 45 +-- .../config/CartridgeAgentConfiguration.java | 14 +- .../agent/util/CartridgeAgentConstants.java | 1 + .../apache/stratos/manager/dto/Cartridge.java | 15 +- .../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 | 11 +- .../DatabaseBasedPersistenceManager.java | 8 +- .../manager/persistence/PersistenceManager.java | 4 +- .../RegistryBasedPersistenceManager.java | 4 +- .../DataInsertionAndRetrievalManager.java | 51 +++- .../service/ApplicationManagementService.java | 2 +- .../subscription/CartridgeSubscription.java | 10 +- .../subscription/DataCartridgeSubscription.java | 28 +- .../DataCartridgeSubscription_old.java | 8 +- .../subscription/LBCartridgeSubscription.java | 9 + .../factory/CartridgeSubscriptionFactory.java | 8 +- .../StratosManagerTopologyReceiver.java | 2 +- .../manager/test/CartridgeSubscriptionTest.java | 72 +++-- .../manager/test/LookupDataHolderTest.java | 282 +++++++++++++++++++ .../stratos/manager/test/PolicyHolderTest.java | 168 +++++------ .../rest/endpoint/services/ServiceUtils.java | 74 +++-- .../rest/endpoint/services/StratosAdmin.java | 2 +- .../distribution/src/main/conf/scaling.drl | 18 +- 33 files changed, 752 insertions(+), 319 deletions(-) ----------------------------------------------------------------------
