summaryrefslogtreecommitdiffstats
path: root/roles/docker/templates/overlay.conf.j2
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2017-11-27 11:51:05 -0500
committerGitHub <noreply@github.com>2017-11-27 11:51:05 -0500
commit747224e87c16b0b4329f71c9e6ae74e4f0bb6178 (patch)
treedc07abc293f84a3609098163087a6df98df3ab7d /roles/docker/templates/overlay.conf.j2
parent174ada425abba669c7fd75368486576c8c376b46 (diff)
parentc16a06911a8c5dd321fd2fedf560e50494305f18 (diff)
downloadopenshift-747224e87c16b0b4329f71c9e6ae74e4f0bb6178.tar.gz
openshift-747224e87c16b0b4329f71c9e6ae74e4f0bb6178.tar.bz2
openshift-747224e87c16b0b4329f71c9e6ae74e4f0bb6178.tar.xz
openshift-747224e87c16b0b4329f71c9e6ae74e4f0bb6178.zip
Merge pull request #6185 from giuseppe/fix-additional-and-insecure-registries-for-crio
cri-o: honor additional and insecure registries again
Diffstat (limited to 'roles/docker/templates/overlay.conf.j2')
0 files changed, 0 insertions, 0 deletions