Merge pull request #43684 from xilabao/patch-10

Automatic merge from submit-queue fix typo in kubeadm join -h ``` Flags: --config string Path to kubeadm config file --discovery-file string A file or url from which to load cluster information --discovery-token string A token used to validate cluster information fetched from the master --skip-preflight-checks skip preflight checks normally run before modifying the system --tls-bootstrap-token string A token used for TLS bootstrapping --token string Use this token for both discovery-token and tls-bootstrap-token ```

Merge pull request #43684 from xilabao/patch-10
756539f4 · Kubernetes Submit Queue · GitHub · 25a87fa1 · 71aeea22 · 756539f4
Commit 756539f4 authored Apr 01, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

join.go cmd/kubeadm/app/cmd/join.go +1 -1

No files found.
--- a/cmd/kubeadm/app/cmd/join.go
+++ b/cmd/kubeadm/app/cmd/join.go
@@ -122,7 +122,7 @@ func NewCmdJoin(out io.Writer) *cobra.Command {

 	cmd.PersistentFlags().BoolVar(
 		&skipPreFlight, "skip-preflight-checks", false,
-		"skip preflight checks normally run before modifying the system",
+		"Skip preflight checks normally run before modifying the system",
 	)

 	return cmd