Merge branch 'container-autoscaling' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/40c0b3cd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/40c0b3cd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/40c0b3cd Branch: refs/heads/master Commit: 40c0b3cd17c638a1a707bcb2bdddc5f4624dfc1c Parents: 58e300a 7d61649 Author: sajhak <[email protected]> Authored: Mon Oct 6 22:54:05 2014 +0530 Committer: sajhak <[email protected]> Committed: Mon Oct 6 22:54:05 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/impl/CloudControllerServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
