Update spf13/cobra with recent commits.

This commit is contained in:
Brendan Burns
2015-03-23 15:09:20 -07:00
parent c66caa5336
commit a18ec3be88
7 changed files with 46 additions and 26 deletions

View File

@@ -16,6 +16,12 @@ kubectl apiversions \- Print available API versions.
Print available API versions.
.SH OPTIONS
.PP
\fB\-h\fP, \fB\-\-help\fP=false
help for apiversions
.SH OPTIONS INHERITED FROM PARENT COMMANDS
.PP
\fB\-\-alsologtostderr\fP=false
@@ -49,10 +55,6 @@ Print available API versions.
\fB\-\-context\fP=""
The name of the kubeconfig context to use
.PP
\fB\-h\fP, \fB\-\-help\fP=false
help for kubectl
.PP
\fB\-\-insecure\-skip\-tls\-verify\fP=false
If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.

View File

@@ -38,13 +38,12 @@ as the selector for a new Service on the specified port.
The name of the API generator to use. Default is 'service/v1'.
.PP
<<<<<<< HEAD
\fB\-l\fP, \fB\-\-labels\fP=""
Labels to apply to the service created by this call.
=======
\fB\-h\fP, \fB\-\-help\fP=false
help for expose
>>>>>>> Revert "Revert "Update cobra/pflag. Also update generated kubectl documentation.""
.PP
\fB\-l\fP, \fB\-\-labels\fP=""
Labels to apply to the service created by this call.
.PP
\fB\-\-no\-headers\fP=false