From 10de5b12fe44d93cc5bdd5b6a53691cca8d8283f Mon Sep 17 00:00:00 2001
From: Claire Li <claire921@gmail.com>
Date: Sat, 12 Jul 2014 11:03:08 -0700
Subject: [PATCH] pkg/kubelet: explicitly return nil as error and nil as a
 result on error

---
 pkg/kubelet/kubelet.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index 39ad4b1dd8f..98f23e4ee54 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -192,7 +192,7 @@ func (kl *Kubelet) getDockerContainers() (map[DockerID]docker.APIContainers, err
 	result := map[DockerID]docker.APIContainers{}
 	containerList, err := kl.DockerClient.ListContainers(docker.ListContainersOptions{})
 	if err != nil {
-		return result, err
+		return nil, err
 	}
 	for _, value := range containerList {
 		// Skip containers that we didn't create to allow users to manually
@@ -202,7 +202,7 @@ func (kl *Kubelet) getDockerContainers() (map[DockerID]docker.APIContainers, err
 		}
 		result[DockerID(value.ID)] = value
 	}
-	return result, err
+	return result, nil
 }
 
 // Return Docker's container ID for a manifest's container. Returns an empty string if it doesn't exist.