Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c32219df Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c32219df Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c32219df Branch: refs/heads/master Commit: c32219df00762aa7dd450e654323550a8980de2e Parents: 8a6ad74 0e2aaba Author: Imesh Gunaratne <[email protected]> Authored: Fri Dec 13 18:11:03 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri Dec 13 18:11:03 2013 +0530 ---------------------------------------------------------------------- .../autoscaler/api/AutoScalerServiceImpl.java | 76 +++++++++----------- .../autoscaler/partition/PartitionManager.java | 22 +++--- .../partition/deployers/PartitionDeployer.java | 2 +- .../autoscaler/policy/PolicyManager.java | 6 -- .../topology/AutoscalerTopologyReceiver.java | 12 +--- 5 files changed, 50 insertions(+), 68 deletions(-) ----------------------------------------------------------------------
