shixiong/okd @ 933174a3b9121b2f9ef47848fe82019dade10d1e

OpenShift Merge Robot 5694ad07a1 Merge pull request #11661 from vrutkovs/crictl-ignore-errors		пре 5 година
..
aws	8ade8da8b9 Use "crio" as a service name	пре 5 година
tox-inventory.txt	0d15601985 Update tox test environment vars	пре 5 година