Skip to content

Commit

Permalink
Merge pull request #17303 from sjenning/pick-49885-3.7
Browse files Browse the repository at this point in the history 
Automatic merge from submit-queue.

UPSTREAM: 49885: Ignore UDP metrics in kubelet [3.7]

master PR #17106

@derekwaynecarr
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored Nov 21, 2017
2 parents 60412ad + aa83b6f commit c4939e3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/cadvisor_linux.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c4939e3

Please sign in to comment.