Merge pull request #16840 from joelsmith/master

Automatic merge from submit-queue. UPSTREAM: 53753: Reduce log spam in qos container manager
openshift · Oct 15, 2017 · 4de9820 · 4de9820
2 parents b9ff58b + 8f8a3c5
commit 4de9820
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cm/qos_container_manager_linux.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cm/qos_container_manager_linux.go