summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-management
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-01 03:27:08 -0700
committerGitHub <noreply@github.com>2017-11-01 03:27:08 -0700
commit7a6662385496109ea1a43614937a50f2fc2d0f81 (patch)
tree94c020a8aba63b41d4eda3430f06aacaf9495154 /playbooks/common/openshift-management
parentd497c5e34d5e85b1c4e1258343fe689413500018 (diff)
parentabcc49d0ccdbdbaaeb69b5dccf68244f36c66246 (diff)
downloadopenshift-7a6662385496109ea1a43614937a50f2fc2d0f81.tar.gz
openshift-7a6662385496109ea1a43614937a50f2fc2d0f81.tar.bz2
openshift-7a6662385496109ea1a43614937a50f2fc2d0f81.tar.xz
openshift-7a6662385496109ea1a43614937a50f2fc2d0f81.zip
Merge pull request #5955 from mgugino-upstream-stage/remove-docker-etc-containers-regs
Automatic merge from submit-queue. Docker: make use of new etc/containers/registries.conf optional Currently, not all versions of docker support using /etc/containers/registries.conf This commit makes the use of that file optional.
Diffstat (limited to 'playbooks/common/openshift-management')
0 files changed, 0 insertions, 0 deletions