Merge pull request #16189 from sjenning/pick-cadv-1700

Automatic merge from submit-queue (batch tested with PRs 14825, 15756, 16178, 16188, 16189) UPSTREAM: google/cadvisor: 1700: Reduce log spam when unable to get network stats google/cadvisor#1700 xref https://bugzilla.redhat.com/show_bug.cgi?id=1328913 @derekwaynecarr
openshift · Sep 7, 2017 · d8a2507 · d8a2507
2 parents 5c677dc + aa3db03
commit d8a2507
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/vendor/github.com/google/cadvisor/container/libcontainer/helpers.go b/vendor/github.com/google/cadvisor/container/libcontainer/helpers.go