summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-23 16:50:15 -0500
committerGitHub <noreply@github.com>2017-05-23 16:50:15 -0500
commit8c57b7f62f6351d03c1e28d7cff88279fc16f88a (patch)
tree6dceeb4903444c9b61e15a41c1d09f238b8eced9
parent807fc98a910dfed4e0c2f9ca7573564f5481aea8 (diff)
parent0b83281570dc7fb607c728fce37a8a0e9bd9fdea (diff)
downloadopenshift-8c57b7f62f6351d03c1e28d7cff88279fc16f88a.tar.gz
openshift-8c57b7f62f6351d03c1e28d7cff88279fc16f88a.tar.bz2
openshift-8c57b7f62f6351d03c1e28d7cff88279fc16f88a.tar.xz
openshift-8c57b7f62f6351d03c1e28d7cff88279fc16f88a.zip
Merge pull request #4230 from ozdanborne/fix-rename
Merged by openshift-bot
-rw-r--r--roles/calico/templates/10-calico.conf.j2 (renamed from roles/calico/templates/calicoctl.conf.j2)0
-rw-r--r--roles/calico/templates/calicoctl.cfg.j2 (renamed from roles/calico/templates/10-calico.cfg.j2)0
2 files changed, 0 insertions, 0 deletions
diff --git a/roles/calico/templates/calicoctl.conf.j2 b/roles/calico/templates/10-calico.conf.j2
index 3c8c6b046..3c8c6b046 100644
--- a/roles/calico/templates/calicoctl.conf.j2
+++ b/roles/calico/templates/10-calico.conf.j2
diff --git a/roles/calico/templates/10-calico.cfg.j2 b/roles/calico/templates/calicoctl.cfg.j2
index 722385ed8..722385ed8 100644
--- a/roles/calico/templates/10-calico.cfg.j2
+++ b/roles/calico/templates/calicoctl.cfg.j2