diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-23 05:57:11 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-23 05:57:11 -0700 |
commit | cd53b726430977bdd5cab772765bae3aed149727 (patch) | |
tree | ec892f1a529e56acfb6c389a4900231ae72d53be /roles/docker/templates/crio.conf.j2 | |
parent | d7cfb9e1a33d1637946aa10af5329290784ab41f (diff) | |
parent | 2e5d7a6a848f20cccf3cf6d38aad4d9a9c80b922 (diff) | |
download | openshift-cd53b726430977bdd5cab772765bae3aed149727.tar.gz openshift-cd53b726430977bdd5cab772765bae3aed149727.tar.bz2 openshift-cd53b726430977bdd5cab772765bae3aed149727.tar.xz openshift-cd53b726430977bdd5cab772765bae3aed149727.zip |
Merge pull request #5818 from ashcrow/1503860
Automatic merge from submit-queue.
docker: Move enterprise registry from pkg to main
Diffstat (limited to 'roles/docker/templates/crio.conf.j2')
0 files changed, 0 insertions, 0 deletions