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/06fb5ea2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/06fb5ea2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/06fb5ea2 Branch: refs/heads/master Commit: 06fb5ea2cc61bac7599fd69758cd955381b8c84b Parents: 42bdeeb 237c0bb Author: Melan Nimesh <[email protected]> Authored: Tue Feb 18 10:09:23 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Tue Feb 18 10:09:23 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/autoscaler/partition/PartitionManager.java | 5 ++++- .../cloud/controller/impl/CloudControllerServiceImpl.java | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
