From 630acf221ca6df38382dca167b8e3da9ac20f4ef Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Sun, 16 Nov 2014 21:32:58 -0500 Subject: [PATCH] alias cadvisor/client to cadvisor cadvisor 0.5.0 changes the package from cadvisor to client. Which of course conflicts with our own client. Alias it back to cadvisor. --- cmd/kubelet/kubelet.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kubelet/kubelet.go b/cmd/kubelet/kubelet.go index 386f0cadcf9..75a59b69065 100644 --- a/cmd/kubelet/kubelet.go +++ b/cmd/kubelet/kubelet.go @@ -42,7 +42,7 @@ import ( "github.com/coreos/go-etcd/etcd" "github.com/fsouza/go-dockerclient" "github.com/golang/glog" - "github.com/google/cadvisor/client" + cadvisor "github.com/google/cadvisor/client" ) const defaultRootDir = "/var/lib/kubelet"