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/bb170400 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bb170400 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bb170400 Branch: refs/heads/master Commit: bb1704007cca6942c319ce4d1956392228fdb8f0 Parents: e6a2b1c c367a8f Author: Imesh Gunaratne <[email protected]> Authored: Mon Dec 23 16:20:53 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Dec 23 16:20:53 2013 +0530 ---------------------------------------------------------------------- .../internal/AutoscalerServerComponent.java | 2 +- .../health/HealthEventMessageDelegator.java | 139 ++++--- .../topology/AutoscalerTopologyReceiver.java | 368 +++++++++++++++++ .../topology/AutoscalerTopologyReceiver.java | 401 ------------------- 4 files changed, 437 insertions(+), 473 deletions(-) ----------------------------------------------------------------------
