Merge pull request #29118 from xiangpengzhao/fix_reversed_var_order

Automatic merge from submit-queue Fix reversed order of variables The order of variables in log is reversed.

Merge pull request #29118 from xiangpengzhao/fix_reversed_var_order
0bfaae16 · k8s-merge-robot · GitHub · be8abdab · 48b5a582 · 0bfaae16
Commit 0bfaae16 authored Jul 19, 2016 by k8s-merge-robot Committed by GitHub Jul 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

docker_manager.go pkg/kubelet/dockertools/docker_manager.go +1 -1

No files found.
--- a/pkg/kubelet/dockertools/docker_manager.go
+++ b/pkg/kubelet/dockertools/docker_manager.go
@@ -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)
 		}
 	}