Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3ce1815d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3ce1815d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3ce1815d Branch: refs/heads/master Commit: 3ce1815d6aa8e8524267489fa6c38a39e928299b Parents: 5e00944 39395ad Author: Imesh Gunaratne <[email protected]> Authored: Wed Dec 18 12:15:04 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Dec 18 12:15:04 2013 +0530 ---------------------------------------------------------------------- .../autoscaler/policy/PolicyManager.java | 5 ++-- .../stratos/cli/RestCommandLineService.java | 1 + products/stratos-cli/README.txt | 31 ++++++++++---------- 3 files changed, 20 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
