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/47750cde Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/47750cde Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/47750cde Branch: refs/heads/master Commit: 47750cdedeceb40c16afe48dfa124fc6276b8251 Parents: 5e0b6f7 80cdb9d Author: Pradeep Fernando <[email protected]> Authored: Thu Jan 9 17:11:01 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Thu Jan 9 17:11:01 2014 +0530 ---------------------------------------------------------------------- .../topology/AutoscalerTopologyReceiver.java | 34 +++++++------------- .../stratos/cli/RestCommandLineService.java | 2 +- 2 files changed, 13 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
