Merge pull request #2407 from eparis/cadvisor-0.5.0

Cadvisor 0.5.0
This commit is contained in:
Victor Marmol
2014-11-17 08:53:36 -08:00
9 changed files with 209 additions and 52 deletions

View File

@@ -45,7 +45,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"