Merge "Corrected help strings."
This commit is contained in:
		@@ -58,8 +58,8 @@ class CeilometerShell(object):
 | 
			
		||||
        parser.add_argument('-k', '--insecure',
 | 
			
		||||
                            default=False,
 | 
			
		||||
                            action='store_true',
 | 
			
		||||
                            help="Explicitly allow glanceclient to perform "
 | 
			
		||||
                            "\"insecure\" SSL (https) requests. "
 | 
			
		||||
                            help="Explicitly allow ceilometerclient to "
 | 
			
		||||
                            "perform \"insecure\" SSL (https) requests. "
 | 
			
		||||
                            "The server's certificate will "
 | 
			
		||||
                            "not be verified against any certificate "
 | 
			
		||||
                            "authorities. This option should be used with "
 | 
			
		||||
@@ -78,7 +78,7 @@ class CeilometerShell(object):
 | 
			
		||||
        parser.add_argument('--ca-file',
 | 
			
		||||
                            help='Path of CA SSL certificate(s) used to verify'
 | 
			
		||||
                            ' the remote server certificate. Without this '
 | 
			
		||||
                            'option glance looks for the default system '
 | 
			
		||||
                            'option ceilometer looks for the default system '
 | 
			
		||||
                            'CA certificates.')
 | 
			
		||||
 | 
			
		||||
        parser.add_argument('--timeout',
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user