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>2018-01-11 02:13:33 -0800
committerGitHub <noreply@github.com>2018-01-11 02:13:33 -0800
commit46f0a28d9ea4d9d599fc93ea2786eff51067432d (patch)
treed10dd826b5c7af1e0bae22e141ea3a4c2d0012c9 /roles/calico/templates/10-calico.conf.j2
parentc5570478de299cb852c530183e8994edf828943c (diff)
parent75f245f01bd3f1d96c87f0d8a2ebe8a13f86c7ec (diff)
downloadopenshift-46f0a28d9ea4d9d599fc93ea2786eff51067432d.tar.gz
openshift-46f0a28d9ea4d9d599fc93ea2786eff51067432d.tar.bz2
openshift-46f0a28d9ea4d9d599fc93ea2786eff51067432d.tar.xz
openshift-46f0a28d9ea4d9d599fc93ea2786eff51067432d.zip
Merge pull request #6665 from spadgett/update-console-template
Automatic merge from submit-queue. Update web console template Update the web console template based on changes in https://github.com/openshift/origin/pull/17575 /assign @sdodson @deads2k fyi
Diffstat (limited to 'roles/calico/templates/10-calico.conf.j2')
0 files changed, 0 insertions, 0 deletions