diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 11:41:01 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 12:09:50 +0200 |
| commit | b2b6f8f33c934c87de580a1665acfe79e434b3ec (patch) | |
| tree | cd740fafe37bb31bf28dbf9da6eba898a7dd1cee /bgpd | |
| parent | Merge branch 'frr/pull/574' (diff) | |
| download | frr-b2b6f8f33c934c87de580a1665acfe79e434b3ec.tar.xz frr-b2b6f8f33c934c87de580a1665acfe79e434b3ec.zip | |
Pre-revert nonmergeable changes
Revert "ospf6d: fix decimal area ID cli"
commit a27cb3cfe901d4f1378116bc91e6656aaed7c74c
Revert "bgpd: add back unicast option to 'address-family vpnv(4&6)' Issue #459"
commit 399598bf6b749daa15d70ad64fc885d00cde1225
Revert "Fix the memory leak"
commit d8d58e98397d8442ec68f8d715b64d5e6000b903
Revert "zebra: 'no ip route 4.1.1.19 255.255.255.255 99' is ambiguous"
commit 83f35619359379687f21c839d61121e4ebe72541
Revert "ospf6d: Allow unconfig of unknown lsa's"
commit 5b0747d71df6006835ead8e6354f70b26f7bca80
Revert "Fix the "Dead assignment" of clang SA."
commit 3a6570a1f145c49155d72a815441025085dd45ad
Revert "snapcraft: Improve README.usage.md based on feedback received"
commit 2a3a819a9c2b2c9700e6228e7352e53b3562776c
Revert "zebra: stop deregistering static nexthops unless removing the static"
commit 1dac3a9619c8436f81c7b37f0252574b0b677dd0
All of these changes do not apply on stable/3.0 due to either CLI
changes or another fix already being present.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/bgp_vty.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 9d5a4bd1c..eef11441d 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -6147,13 +6147,6 @@ DEFUN (address_family_vpnv4, return CMD_SUCCESS; } -ALIAS (address_family_vpnv4, - address_family_vpnv4_unicast_cmd, - "address-family vpnv4 unicast", - "Enter Address Family command mode\n" - "Address family\n" - "Address Family modifier\n") - DEFUN (address_family_vpnv6, address_family_vpnv6_cmd, "address-family vpnv6", @@ -6164,13 +6157,6 @@ DEFUN (address_family_vpnv6, return CMD_SUCCESS; } -ALIAS (address_family_vpnv6, - address_family_vpnv6_unicast_cmd, - "address-family vpnv6 unicast", - "Enter Address Family command mode\n" - "Address family\n" - "Address Family modifier\n") - DEFUN (address_family_encap, address_family_encap_cmd, "address-family encap", @@ -15173,9 +15159,7 @@ bgp_vty_init (void) install_element (BGP_NODE, &address_family_ipv6_cmd); install_element (BGP_NODE, &address_family_ipv6_safi_cmd); install_element (BGP_NODE, &address_family_vpnv4_cmd); - install_element (BGP_NODE, &address_family_vpnv4_unicast_cmd); install_element (BGP_NODE, &address_family_vpnv6_cmd); - install_element (BGP_NODE, &address_family_vpnv6_unicast_cmd); install_element (BGP_NODE, &address_family_encap_cmd); install_element (BGP_NODE, &address_family_encapv4_cmd); install_element (BGP_NODE, &address_family_encapv6_cmd); |