Merge pull request #17261 from nikhiljindal/masterClean

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-17 08:16:18 -08:00
commit 0798915490

View File

@ -182,7 +182,6 @@ type Config struct {
// StorageVersions is a map between groups and their storage versions
StorageVersions map[string]string
EventTTL time.Duration
NodeRegexp string
KubeletClient client.KubeletClient
// allow downstream consumers to disable the core controller loops
EnableCoreControllers bool