From 3b2e715888f004a4e4a5142a05dfab080023457f Mon Sep 17 00:00:00 2001
From: Rohit Yadav <bhaisaab@apache.org>
Date: Tue, 20 Nov 2012 14:13:24 +0530
Subject: [PATCH] cli: string fixes, use the major,minor version numbers same
 as CloudStack

<cloudstack major>.<cloudstack minor>.<cloudmonkey increment number>

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
---
 tools/cli/cloudmonkey/cloudmonkey.py | 2 +-
 tools/cli/cloudmonkey/common.py      | 5 ++---
 tools/cli/setup.py                   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/cli/cloudmonkey/cloudmonkey.py b/tools/cli/cloudmonkey/cloudmonkey.py
index 4904a64ff79..657af1f7cca 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"
 
diff --git a/tools/cli/cloudmonkey/common.py b/tools/cli/cloudmonkey/common.py
index 0799017778f..8a64a5d1a27 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
diff --git a/tools/cli/setup.py b/tools/cli/setup.py
index 627a938e5ba..4343eef0d21 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(),