scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29118 from xiangpengzhao/fix_reversed_var_order

Browse Source 
Automatic merge from submit-queue

Fix reversed order of variables

The order of variables in log is reversed.
This commit is contained in:
k8s-merge-robot
2016-07-19 02:52:25 -07:00
committed by GitHub
parent be8abdabf8 48b5a5825a
commit 0bfaae16a0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1603,7 +1603,7 @@ func (dm *DockerManager) applyOOMScoreAdjIfNeeded(pod *api.Pod, container *api.C
// If current api version is older than OOMScoreAdj requested, use the old way.
if result < 0 {
if err := dm.applyOOMScoreAdj(pod, container, containerInfo); err != nil {
return fmt.Errorf("Failed to apply oom-score-adj to container %q- %v", err, containerInfo.Name)
return fmt.Errorf("Failed to apply oom-score-adj to container %q- %v", containerInfo.Name, err)
}
}