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
..
conformance	Update BUILD file to include e2e_node tests	2017-11-17 17:28:29 +08:00
e2e	Merge pull request #55103 from ConnorDoyle/remove-oir	2017-11-22 00:27:27 -08:00
e2e_node	Revert "Kubelet flags take precedence over config from files/ConfigMaps"	2017-11-21 23:55:43 -05:00
fixtures	add test for convert	2017-11-01 01:14:24 -07:00
images	update-all generated	2017-11-21 13:00:40 -08:00
integration	Merge pull request #56004 from caesarxuchao/admission-v1beta1	2017-11-21 17:04:54 -08:00
kubemark	Bump addon manager version used to 6.5	2017-11-15 11:34:46 +01:00
list	update BUILD files	2017-10-15 18:18:13 -07:00
soak	Update generated files	2017-11-09 12:14:08 +01:00
utils	convert testScaledRolloutDeployment e2e test to integration test	2017-11-20 15:36:27 -08:00
BUILD	Add conformance test regression test.	2017-10-27 15:31:20 -07:00
OWNERS	Add shyamjvs to test/OWNERS	2017-11-08 15:44:56 +01:00
test_owners.csv	remove tpr from test_owners.csv	2017-11-03 21:17:10 +05:30
test_owners.json	Remove all traces of federation	2017-10-26 13:37:37 -07:00