Merge pull request #3760 from ncdc/carry-10647

Merged by openshift-bot
openshift · Jul 20, 2015 · 1695461 · 1695461
2 parents 8374fb2 + 46f9bb3
commit 1695461
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/server.go b/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/server.go