Merge pull request #17265 from gambol99/rj/node_labels

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-24 06:55:31 -08:00
5 changed files with 286 additions and 1 deletions

View File

@@ -207,6 +207,8 @@ network-plugin-dir
node-instance-group
node-monitor-grace-period
node-monitor-period
node-label
node-labels-file
node-startup-grace-period
node-status-update-frequency
node-sync-period