diff options
| author | zdc <zdc@users.noreply.github.com> | 2021-11-01 17:04:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 17:04:11 +0200 |
| commit | 1b7c879b9fed2f4563477039bc6ddf4dc0db5829 (patch) | |
| tree | a0ea609a933a4d2e54d5712e2b1671a19181c372 /interface-definitions/include | |
| parent | 3fd2ff423b6c6e992b2ed531c7ba99fb9e1a2123 (diff) | |
| parent | 85bf315f71b411e3cdcd19793c4f7e1e5efed917 (diff) | |
| download | vyos-1x-1b7c879b9fed2f4563477039bc6ddf4dc0db5829.tar.gz vyos-1x-1b7c879b9fed2f4563477039bc6ddf4dc0db5829.zip | |
Merge branch 'current' into T3350-sagitta
Diffstat (limited to 'interface-definitions/include')
| -rw-r--r-- | interface-definitions/include/bgp/afi-aggregate-address.xml.i | 1 | ||||
| -rw-r--r-- | interface-definitions/include/bgp/protocol-common-config.xml.i | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/interface-definitions/include/bgp/afi-aggregate-address.xml.i b/interface-definitions/include/bgp/afi-aggregate-address.xml.i index 646751c32..c1b7958da 100644 --- a/interface-definitions/include/bgp/afi-aggregate-address.xml.i +++ b/interface-definitions/include/bgp/afi-aggregate-address.xml.i @@ -5,6 +5,7 @@ <valueless/> </properties> </leafNode> +#include <include/route-map.xml.i> <leafNode name="summary-only"> <properties> <help>Announce the aggregate summary network only</help> diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i index 30033bc50..2dfae517e 100644 --- a/interface-definitions/include/bgp/protocol-common-config.xml.i +++ b/interface-definitions/include/bgp/protocol-common-config.xml.i @@ -1253,12 +1253,6 @@ </constraint> </properties> </leafNode> - <leafNode name="no-ipv4-unicast"> - <properties> - <help>Deactivate IPv4 unicast for a peer by default</help> - <valueless/> - </properties> - </leafNode> </children> </node> <leafNode name="deterministic-med"> |