summaryrefslogtreecommitdiffstats
path: root/roles/calico/templates/10-calico.conf.j2
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-30 08:05:25 -0700
committerGitHub <noreply@github.com>2017-10-30 08:05:25 -0700
commit0b0dea682dfc957651c035eb822afe89d16895af (patch)
tree5db15ed352cde6d0457b6b2f4bcbab772b55dcb5 /roles/calico/templates/10-calico.conf.j2
parent4c773d4c3d884bb51b153249b8d7c2576e977ec1 (diff)
parent3d3853836d71c37a9c81aea8e606c94052439789 (diff)
downloadopenshift-0b0dea682dfc957651c035eb822afe89d16895af.tar.gz
openshift-0b0dea682dfc957651c035eb822afe89d16895af.tar.bz2
openshift-0b0dea682dfc957651c035eb822afe89d16895af.tar.xz
openshift-0b0dea682dfc957651c035eb822afe89d16895af.zip
Merge pull request #5769 from jarrpa/image-revert
Automatic merge from submit-queue. GlusterFS: Remove image option from heketi command Reverts #5562, option has been removed from heketi command Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1502054 Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
Diffstat (limited to 'roles/calico/templates/10-calico.conf.j2')
0 files changed, 0 insertions, 0 deletions