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/bdaf0e37 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bdaf0e37 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bdaf0e37 Branch: refs/heads/master Commit: bdaf0e375c4153febd3bfe5fb6eb345516f32fae Parents: 76a14e3 b797ef7 Author: Isuru <[email protected]> Authored: Tue Dec 17 19:57:51 2013 +0530 Committer: Isuru <[email protected]> Committed: Tue Dec 17 19:57:51 2013 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/ClusterMonitor.java | 2 +- .../stratos/cli/RestCommandLineService.java | 78 +++++++++++++++++--- .../apache/stratos/cli/utils/CliConstants.java | 1 + 3 files changed, 68 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
