Merge pull request #20232 from mml/daemonset-warn

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-05 23:12:51 -08:00
6 changed files with 96 additions and 22 deletions

View File

@@ -140,6 +140,7 @@ host-pid-sources
hostname-override
http-check-frequency
http-port
ignore-daemonsets
ignore-not-found
image-gc-high-threshold
image-gc-low-threshold