Skip to content

Commit

Permalink
Merge pull request kubernetes#39400 from xilabao/fix-wrong-help-messa…
Browse files Browse the repository at this point in the history
…ge-for-taint

Automatic merge from submit-queue (batch tested with PRs 39409, 39400)

fix wrong help message for taint

fix kubernetes#39381
  • Loading branch information
Kubernetes Submit Queue authored Jan 4, 2017
2 parents 7d31bf4 + a8b1549 commit ee03b9b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/kubectl/cmd/taint.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var (
* A taint consists of a key, value, and effect. As an argument here, it is expressed as key=value:effect.
* The key must begin with a letter or number, and may contain letters, numbers, hyphens, dots, and underscores, up to %[1]d characters.
* The value must begin with a letter or number, and may contain letters, numbers, hyphens, dots, and underscores, up to %[1]d characters.
* The value must begin with a letter or number, and may contain letters, numbers, hyphens, dots, and underscores, up to %[2]d characters.
* The effect must be NoSchedule or PreferNoSchedule.
* Currently taint can only apply to node.`)

Expand Down

0 comments on commit ee03b9b

Please sign in to comment.