summaryrefslogtreecommitdiffstats
path: root/roles/docker/templates/registries.conf
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-25 16:22:08 -0700
committerGitHub <noreply@github.com>2017-10-25 16:22:08 -0700
commitd82771fc2c4da0fea5fd20dece069520f650ebb1 (patch)
treedbe4bc230a95ea793bb9edaa06d08a040fe313a7 /roles/docker/templates/registries.conf
parent305e4897dd6591ee8055414f80e43275696558d2 (diff)
parent657cf2a8290d7ba1d3307234f7214b09f5fbeb90 (diff)
downloadopenshift-d82771fc2c4da0fea5fd20dece069520f650ebb1.tar.gz
openshift-d82771fc2c4da0fea5fd20dece069520f650ebb1.tar.bz2
openshift-d82771fc2c4da0fea5fd20dece069520f650ebb1.tar.xz
openshift-d82771fc2c4da0fea5fd20dece069520f650ebb1.zip
Merge pull request #5655 from giuseppe/etcd-additional-bind-mount
Automatic merge from submit-queue. etcd: remove hacks for the system container This removes the special handling of the etcd directories when running as a system container. Marked as WIP as it depends from this [change](https://bugzilla.redhat.com/show_bug.cgi?id=1484326) in the etcd image to be reflected into `registry.access.redhat.com/rhel7/etcd`
Diffstat (limited to 'roles/docker/templates/registries.conf')
0 files changed, 0 insertions, 0 deletions