OpenShift Merge Robot 4ceb4bd931 Merge pull request #5205 from mgugino-upstream-stage/docker-etc-containers-regs %!s(int64=7) %!d(string=hai) anos
..
node.service.j2 46d9ba942e Set TimeoutStartSec=300 %!s(int64=7) %!d(string=hai) anos
openshift.docker.node.dep.service b35272a794 Move additional/block/insecure registires to /etc/containers/registries.conf %!s(int64=7) %!d(string=hai) anos
openshift.docker.node.service 3d9af759fe Fix registry_auth logic for upgrades %!s(int64=7) %!d(string=hai) anos
openvswitch-avoid-oom.conf 9221ef2b06 Move current node upgrade tasks under openshift_node_upgrade role %!s(int64=8) %!d(string=hai) anos
openvswitch.docker.service b7ccac9415 Update systemd units to use proper container service name %!s(int64=8) %!d(string=hai) anos
openvswitch.sysconfig.j2 9221ef2b06 Move current node upgrade tasks under openshift_node_upgrade role %!s(int64=8) %!d(string=hai) anos