Merge pull request #16931 from sjenning/pick-cadv-1770

Automatic merge from submit-queue (batch tested with PRs 16912, 16931, 16939, 16967, 16978). UPSTREAM: google/cadvisor: 1770: Monitor diff directory for overlay2 google/cadvisor#1770 Fixes per-container disk usage accounting when using overlay2 @derekwaynecarr
openshift · Oct 20, 2017 · a8dde92 · a8dde92
2 parents a0a87ed + 63c8a31
commit a8dde92
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/vendor/github.com/google/cadvisor/container/docker/handler.go b/vendor/github.com/google/cadvisor/container/docker/handler.go