diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-11-24 20:33:25 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-11-24 20:33:25 +0100 |
| commit | 525af4f27dc2aa7e226f2bba46b4b1736bbc014f (patch) | |
| tree | 8068edf769df8f680246ebd0e5e1e6e625ff3ed2 /data | |
| parent | 24b23d41146eddd8fb0609ad4ae85d27e7c6ec6a (diff) | |
| parent | 5238f0970219639e988bc31beb7db27b43f94e6e (diff) | |
| download | vyos-1x-525af4f27dc2aa7e226f2bba46b4b1736bbc014f.tar.gz vyos-1x-525af4f27dc2aa7e226f2bba46b4b1736bbc014f.zip | |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x:
bridge: T1673: re-use "base" variable
bridge: T1673: add missing VLAN bridge member migration
geneve: T1799: add misssing "vni" to default_config_data
vxlan: T1636: add misssing "vni" to default_config_data
geneve: T1799: set minimum MTU size 1500 bytes
geneve: T1799: add IPv4 routing parameters
geneve: T1799: support bridging
geneve: T1799: add Generic Network Virtualization Encapsulation
Diffstat (limited to 'data')
| -rw-r--r-- | data/interface-types.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/data/interface-types.json b/data/interface-types.json index f1862b882..f174d3c39 100644 --- a/data/interface-types.json +++ b/data/interface-types.json @@ -14,5 +14,6 @@ "wireless": "wlan", "wirelessmodem": "wlm", "input": "ifb", - "pppoe": "pppoe" + "pppoe": "pppoe", + "geneve": "gnv" } |