diff options
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/version/interfaces-version.xml.i | 4 | ||||
| -rw-r--r-- | interface-definitions/interfaces-vxlan.xml.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/interface-definitions/include/version/interfaces-version.xml.i b/interface-definitions/include/version/interfaces-version.xml.i index 3d11ce888..25f158508 100644 --- a/interface-definitions/include/version/interfaces-version.xml.i +++ b/interface-definitions/include/version/interfaces-version.xml.i @@ -1,3 +1,7 @@ <!-- include start from include/version/interfaces-version.xml.i --> +<<<<<<< HEAD <syntaxVersion component='interfaces' version='30'></syntaxVersion> +======= +<syntaxVersion component='interfaces' version='32'></syntaxVersion> +>>>>>>> 6db8d3ded (vxlan: T5671: change port to IANA assigned default port) <!-- include end --> diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index b246d9a09..3fae17178 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -93,7 +93,7 @@ </node> #include <include/port-number.xml.i> <leafNode name="port"> - <defaultValue>8472</defaultValue> + <defaultValue>4789</defaultValue> </leafNode> #include <include/source-address-ipv4-ipv6.xml.i> #include <include/source-interface.xml.i> |