diff options
| author | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-09-26 13:19:37 +0200 |
|---|---|---|
| committer | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-09-26 13:19:37 +0200 |
| commit | 1141bee72677b25d18436975625d2d298be503ff (patch) | |
| tree | 4b6dc8fe1a8ced931e1ba08c58a348abfcd85a6b /interface-definitions/include/vif.xml.i | |
| parent | 45b30adfaaec7065f768d04085138a75a76ed376 (diff) | |
| parent | 374724be64728101c262fcac1579beece63ee651 (diff) | |
| download | vyos-1x-1141bee72677b25d18436975625d2d298be503ff.tar.gz vyos-1x-1141bee72677b25d18436975625d2d298be503ff.zip | |
Merge remote-tracking branch 'upstream/current' into current
Diffstat (limited to 'interface-definitions/include/vif.xml.i')
| -rw-r--r-- | interface-definitions/include/vif.xml.i | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i index 5a4e52122..919e4d493 100644 --- a/interface-definitions/include/vif.xml.i +++ b/interface-definitions/include/vif.xml.i @@ -50,6 +50,7 @@ #include <include/interface-enable-arp-announce.xml.i> #include <include/interface-enable-arp-ignore.xml.i> #include <include/interface-enable-proxy-arp.xml.i> + #include <include/interface-proxy-arp-pvlan.xml.i> </children> </node> <node name="ipv6"> |