Merge pull request #88584 from willise/master

fix: remove conflict comment of taint "Value"
This commit is contained in:
Kubernetes Prow Robot
2020-03-02 20:03:37 -08:00
committed by GitHub
4 changed files with 4 additions and 4 deletions

View File

@@ -10099,7 +10099,7 @@
"description": "TimeAdded represents the time at which the taint was added. It is only written for NoExecute taints."
},
"value": {
"description": "Required. The taint value corresponding to the taint key.",
"description": "The taint value corresponding to the taint key.",
"type": "string"
}
},