Merge pull request #29162 from xiangpengzhao/fix_err_to_cerr

Automatic merge from submit-queue Fix wrong variable of error Should not log `err` but `cerr`.

Merge pull request #29162 from xiangpengzhao/fix_err_to_cerr
6df62ff3 · k8s-merge-robot · GitHub · b7490d5c · 2d7dbc22 · 6df62ff3
Commit 6df62ff3 authored Jul 20, 2016 by k8s-merge-robot Committed by GitHub Jul 20, 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
@@ -1332,7 +1332,7 @@ func (dm *DockerManager) KillContainerInPod(containerID kubecontainer.ContainerI
 		}
 		storedPod, storedContainer, cerr := containerAndPodFromLabels(inspect)
 		if cerr != nil {
-			glog.Errorf("unable to access pod data from container: %v", err)
+			glog.Errorf("unable to access pod data from container: %v", cerr)
 		}
 		if container == nil {
 			container = storedContainer