Kubernetes Submit Queue bd8d8f4387 Merge pull request #56186 from liggitt/master ...

Automatic merge from submit-queue (batch tested with PRs 55103, 56036, 56186). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Revert "Kubelet flags take precedence over config from files/ConfigMaps"

This reverts commit cbebb61450.

Per https://github.com/kubernetes/kubernetes/pull/56097#issuecomment-346243014

```release-note
NONE
```

2017-11-22 00:27:32 -08:00

..

app

Merge pull request #54529 from vladimirvivien/k8s-csi-intree-plugin

2017-11-21 21:38:56 -08:00

BUILD

update BUILD files

2017-10-15 18:18:13 -07:00

kubelet.go

Revert "Kubelet flags take precedence over config from files/ConfigMaps"

2017-11-21 23:55:43 -05:00

OWNERS

Update OWNERS

2017-01-18 15:18:04 -08:00