Scott Dodson 4c15d9c272 Merge pull request #5705 from mgugino-upstream-stage/docker-partof-iptables %!s(int64=7) %!d(string=hai) anos
..
80-openshift-sdn.conf.j2 31e708a5d4 cri-o: configure the CNI network %!s(int64=7) %!d(string=hai) anos
crio.conf.j2 73aaf6cb2c crio: use systemd manager %!s(int64=7) %!d(string=hai) anos
custom.conf.j2 91892aad5f Add PartOf to docker systemd service unit. %!s(int64=7) %!d(string=hai) anos
daemon.json 6bc3ccc096 Remove userland-proxy-path from daemon.json %!s(int64=8) %!d(string=hai) anos
overlay.conf.j2 941b8905fe cri-o: Ensure overlay is available %!s(int64=7) %!d(string=hai) anos
registries.conf 892f6fa790 Fix typo in files (Docker registries) %!s(int64=7) %!d(string=hai) anos
systemcontainercustom.conf.j2 9e9dc2260e systemcontainercustom.conf.j2: use Environment instead of ENVIRONMENT %!s(int64=8) %!d(string=hai) anos