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/c367a8f0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c367a8f0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c367a8f0 Branch: refs/heads/master Commit: c367a8f013db06165eb52f34f54aa95503c2a2c3 Parents: 3700934 bbbe3a0 Author: Udara Liyanage <[email protected]> Authored: Mon Dec 23 04:51:08 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Mon Dec 23 04:51:08 2013 -0500 ---------------------------------------------------------------------- .../internal/AutoscalerServerComponent.java | 2 +- .../topology/AutoscalerTopologyReceiver.java | 315 +++++++++---------- 2 files changed, 142 insertions(+), 175 deletions(-) ----------------------------------------------------------------------
