Code

Pick kubelet CRI-O enhancements#16441

Code

Merged

openshift-merge-robot merged 3 commits intoopenshift:masteropenshift/origin:masterfrom sjenning:pick-kubelet-criosjenning/origin:pick-kubelet-crioCopy head branch name to clipboardSep 21, 2017

+129-34

Commits

Commits on Sep 19, 2017

• UPSTREAM: 51728: Enable CRI-O stats from cAdvisor

  sjenning

  committed
  7955fda

  Copy full SHA for 7955fda

• UPSTREAM: 52073: Fix cross-build

  sjenning

  committed
  75a0abe

  Copy full SHA for 75a0abe

• UPSTREAM: 52297: Use cAdvisor constant for crio imagefs

  sjenning

  committed
  34e0a3c

  Copy full SHA for 34e0a3c