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/218035f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/218035f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/218035f5 Branch: refs/heads/master Commit: 218035f5fa2cd106ada0bc847a74f8a725aa9678 Parents: 21d9857 a050942 Author: Pradeep Fernando <[email protected]> Authored: Fri Jan 17 19:14:45 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Fri Jan 17 19:14:45 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/NetworkPartitionContext.java | 19 ++ .../org.apache.stratos.cartridge.agent/pom.xml | 10 +- .../stratos/cartridge/agent/CartridgeAgent.java | 8 +- .../cartridge/agent/RepositoryFileListener.java | 2 +- .../git/impl/GitBasedArtifactRepository.java | 181 ++++++++++++++++--- .../git/internal/RepositoryContext.java | 11 +- .../impl/CloudControllerServiceImpl.java | 48 ++--- .../manager/CartridgeSubscriptionManager.java | 10 +- .../distribution/src/main/conf/scaling.drl | 95 +++++----- .../distribution/src/main/extensions/clean.sh | 3 +- 10 files changed, 277 insertions(+), 110 deletions(-) ----------------------------------------------------------------------
