Updated Branches: refs/heads/master 2a0d0104b -> 3b2e71588
cli: string fixes, use the major,minor version numbers same as CloudStack <cloudstack major>.<cloudstack minor>.<cloudmonkey increment number> Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3b2e7158 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3b2e7158 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3b2e7158 Branch: refs/heads/master Commit: 3b2e715888f004a4e4a5142a05dfab080023457f Parents: 2a0d010 Author: Rohit Yadav <[email protected]> Authored: Tue Nov 20 14:13:24 2012 +0530 Committer: Rohit Yadav <[email protected]> Committed: Tue Nov 20 14:56:34 2012 +0530 ---------------------------------------------------------------------- tools/cli/cloudmonkey/cloudmonkey.py | 2 +- tools/cli/cloudmonkey/common.py | 5 ++--- tools/cli/setup.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3b2e7158/tools/cli/cloudmonkey/cloudmonkey.py ---------------------------------------------------------------------- diff --git a/tools/cli/cloudmonkey/cloudmonkey.py b/tools/cli/cloudmonkey/cloudmonkey.py index 4904a64..657af1f 100644 --- a/tools/cli/cloudmonkey/cloudmonkey.py +++ b/tools/cli/cloudmonkey/cloudmonkey.py @@ -81,7 +81,7 @@ class CloudStackShell(cmd.Cmd): for key in self.config_fields.keys(): setattr(self, key, self.config_fields[key]) config = self.write_config() - print "Welcome! Using `set` configure the necessary settings" + print "Welcome! Using `set` configure the necessary settings:" print " ".join(sorted(self.config_fields.keys())) print "For debugging, tail -f", self.log_file, "\n" http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3b2e7158/tools/cli/cloudmonkey/common.py ---------------------------------------------------------------------- diff --git a/tools/cli/cloudmonkey/common.py b/tools/cli/cloudmonkey/common.py index 0799017..8a64a5d 100644 --- a/tools/cli/cloudmonkey/common.py +++ b/tools/cli/cloudmonkey/common.py @@ -17,9 +17,8 @@ # under the License. # Use following rules for versioning: -# <cli major version>.<cloudstack minor version>.<cloudstack major version> -# Example: For CloudStack 4.1.x, CLI version should be 0.1.4 -__version__ = "0.0.4" +# <cloudstack major version>.<cloudstack minor version>.<cli increment> +__version__ = "4.0.0" try: import os http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3b2e7158/tools/cli/setup.py ---------------------------------------------------------------------- diff --git a/tools/cli/setup.py b/tools/cli/setup.py index 627a938..4343eef 100644 --- a/tools/cli/setup.py +++ b/tools/cli/setup.py @@ -43,7 +43,7 @@ setup( url = "http://incubator.apache.org/cloudstack";, description = "Command Line Interface for Apache CloudStack", long_description = "cloudmonkey is a command line interface for Apache " - "CloudStack powered by CloudStack Marvin testclient", + "CloudStack powered by CloudStack Marvin", platforms = ("Any",), license = 'ASL 2.0', packages = find_packages(),
