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/cdadeea3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cdadeea3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cdadeea3 Branch: refs/heads/master Commit: cdadeea346bd1273ca218f71653d45866e04d6a4 Parents: a448bff bbe57a0 Author: Manula Thantriwatte <[email protected]> Authored: Thu Dec 12 22:56:19 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Thu Dec 12 22:56:19 2013 +0530 ---------------------------------------------------------------------- .../internal/ADCManagementServerComponent.java | 23 +- .../StratosManagerTopologyReceiver.java | 293 +++++++++++++++++++ .../autoscaler/policy/PolicyManager.java | 46 +++ .../stratos/autoscaler/util/AutoscalerUtil.java | 39 --- 4 files changed, 356 insertions(+), 45 deletions(-) ----------------------------------------------------------------------
