github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #38502 from resouer/fix-wrong-comment 

Automatic merge from submit-queue (batch tested with PRs 38154, 38502)

Wrong comment to describe docker version

The original comment about minimal docker version fo `room_score_adj` is wrong (though the code is right).

Really sorry for misleading :/
pull/6/head
Kubernetes Submit Queue 2016-12-14 14:21:53 -08:00 committed by GitHub
parent d8efc779ed 07d1736077
commit f49442d433
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/dockertools/docker_manager.go
View File

@ -729,7 +729,7 @@ func (dm *DockerManager) runContainer(
} }
} }
// If current api version is newer than docker 1.10 requested, set OomScoreAdj to HostConfig // If current api version is equal to or newer than docker 1.10 requested, set OomScoreAdj to HostConfig
result, err := dm.checkDockerAPIVersion(dockerV110APIVersion) result, err := dm.checkDockerAPIVersion(dockerV110APIVersion)
if err != nil { if err != nil {
glog.Errorf("Failed to check docker api version: %v", err) glog.Errorf("Failed to check docker api version: %v", err)