Merge pull request #16048 from smarterclayton/cadvisor_fix

Automatic merge from submit-queue UPSTREAM: 51473: Fix cAdvisor prometheus metrics Fixes #15974 @sjenning
openshift · Sep 1, 2017 · af2f650 · af2f650
2 parents 9c514fe + 42b9ef1
commit af2f650
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/cadvisor_linux.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/cadvisor_linux.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/server/server.go b/vendor/k8s.io/kubernetes/pkg/kubelet/server/server.go