shixiong/okd @ 7d8d21b7a5170fa3b187d7afe6d010a2e888fe74

OpenShift Merge Robot fa83e18739 Merge pull request #5519 from giuseppe/crio-set-proper-tag		7 jaren geleden
..
main.yml	ae41ccac17 crio: skip installation on lbs and nfs nodes	7 jaren geleden
package_docker.yml	b35272a794 Move additional/block/insecure registires to /etc/containers/registries.conf	7 jaren geleden
systemcontainer_crio.yml	c8587811d4 crio: set the correct image name with OSE	7 jaren geleden
systemcontainer_docker.yml	ab973c7239 container-engine: Allow full image override	7 jaren geleden
udev_workaround.yml	ec9c22ca6a Refactored to use Ansible systemd module	8 jaren geleden