Merge remote-tracking branch 'origin/docker-grouping-merge' into docker-grouping-merge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0497e4c1 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0497e4c1 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0497e4c1 Branch: refs/heads/master Commit: 0497e4c188b97e9238a942d5e1b0fb63d0b986cd Parents: 301e44f 8e0425f Author: Imesh Gunaratne <[email protected]> Authored: Sat Nov 8 21:04:30 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Sat Nov 8 21:04:30 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/algorithm/AutoscaleAlgorithm.java | 2 +- .../algorithm/InstanceCountRoundingAlgorithm.java | 12 ++++++++++++ .../controller/impl/CloudControllerServiceImpl.java | 14 ++++---------- 3 files changed, 17 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
