Merge pull request #55311 from CaoShuFeng/scheduler-trivial

Automatic merge from submit-queue (batch tested with PRs 53747, 54528, 55279, 55251, 55311). 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>. [trivil] fix comment in kube-scheduler **Release note**: ``` NONE ```

Merge pull request #55311 from CaoShuFeng/scheduler-trivial
4886a709 · Kubernetes Submit Queue · GitHub · 412271d4 · 612b334f · 4886a709
Unverified Commit 4886a709 authored Nov 08, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

server.go plugin/cmd/kube-scheduler/app/server.go +1 -1

No files found.
--- a/plugin/cmd/kube-scheduler/app/server.go
+++ b/plugin/cmd/kube-scheduler/app/server.go
@@ -258,7 +258,7 @@ func (o *Options) loadConfigFromFile(file string) (*componentconfig.KubeSchedule
 	return o.loadConfig(data)
 }

-// loadConfig decodes data as a KubeProxyConfiguration object.
+// loadConfig decodes data as a KubeSchedulerConfiguration object.
 func (o *Options) loadConfig(data []byte) (*componentconfig.KubeSchedulerConfiguration, error) {
 	configObj, gvk, err := o.codecs.UniversalDecoder().Decode(data, nil, nil)
 	if err != nil {