summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-09-21 08:17:20 +0200
committerGitHub <noreply@github.com>2021-09-21 08:17:20 +0200
commit0dcea68dc73e27c8ba04100babb349d7d235ea72 (patch)
treeeb0b0bcdbf13bbb40cd1db7f997408b8f08c2281
parent1b269e0798f294b9b893190a14f5dc48e65207c5 (diff)
parenta8b2e52148da69615285d03e8f89c1ac03990861 (diff)
downloadvyos-1x-0dcea68dc73e27c8ba04100babb349d7d235ea72.tar.gz
vyos-1x-0dcea68dc73e27c8ba04100babb349d7d235ea72.zip
Merge pull request #1013 from sarthurdev/current
github: Add .gitattributes to correct language detection
-rw-r--r--.gitattributes4
-rw-r--r--interface-definitions/include/routing-passive-interface.xml.i (renamed from interface-definitions/include/routing-passive-interface-xml.i)2
-rw-r--r--interface-definitions/protocols-rip.xml.in2
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..ea2cc59e4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+data/templates/**/*.conf linguist-language=Jinja
+*.tmpl linguist-language=Jinja
+*.xml.i linguist-language=XML
+*.xml.in linguist-language=XML
diff --git a/interface-definitions/include/routing-passive-interface-xml.i b/interface-definitions/include/routing-passive-interface.xml.i
index 9bd4dac2a..43dfb5e44 100644
--- a/interface-definitions/include/routing-passive-interface-xml.i
+++ b/interface-definitions/include/routing-passive-interface.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from routing-passive-interface-xml.i -->
+<!-- include start from routing-passive-interface.xml.i -->
<leafNode name="passive-interface">
<properties>
<help>Suppress routing updates on an interface</help>
diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in
index 4fcfcfc27..d3be4e1af 100644
--- a/interface-definitions/protocols-rip.xml.in
+++ b/interface-definitions/protocols-rip.xml.in
@@ -155,7 +155,7 @@
#include <include/static/static-route-distance.xml.i>
</children>
</tagNode>
- #include <include/routing-passive-interface-xml.i>
+ #include <include/routing-passive-interface.xml.i>
<node name="redistribute">
<properties>
<help>Redistribute information from another routing protocol</help>