From 48b5a5825a0b69c3577d615526a2f25b7ff51f4f Mon Sep 17 00:00:00 2001 From: xiangpengzhao Date: Mon, 18 Jul 2016 08:06:54 -0400 Subject: [PATCH] Fix reversed order of variables --- pkg/kubelet/dockertools/docker_manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/dockertools/docker_manager.go b/pkg/kubelet/dockertools/docker_manager.go index 43dd87cb077..9a7fb2fe1d6 100644 --- a/pkg/kubelet/dockertools/docker_manager.go +++ b/pkg/kubelet/dockertools/docker_manager.go @@ -1602,7 +1602,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) } }