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 13:53:13 -0700
committerGitHub <noreply@github.com>2017-10-25 13:53:13 -0700
commit305e4897dd6591ee8055414f80e43275696558d2 (patch)
tree8c960292aa4716729878575fed3f4544e1961586 /roles/docker/templates/registries.conf
parent2055aa066d8219393db64f42afc384c8123f48f2 (diff)
parent4fd0ebf47da746bd13421240b00b32b1376487e3 (diff)
downloadopenshift-305e4897dd6591ee8055414f80e43275696558d2.tar.gz
openshift-305e4897dd6591ee8055414f80e43275696558d2.tar.bz2
openshift-305e4897dd6591ee8055414f80e43275696558d2.tar.xz
openshift-305e4897dd6591ee8055414f80e43275696558d2.zip
Merge pull request #5830 from abutcher/registry-deployment
Automatic merge from submit-queue. Ensure deployment_subtype is set within openshift_sanitize_inventory. https://bugzilla.redhat.com/show_bug.cgi?id=1504021
Diffstat (limited to 'roles/docker/templates/registries.conf')
0 files changed, 0 insertions, 0 deletions