diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-06 15:58:21 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-06 15:58:21 +0100 |
| commit | 3b14d86eed3c042db718c7e006ca5299f473c88e (patch) | |
| tree | 4efde6b2d77f5229ace3375da3471b0db1daa695 /ospf6d/ospf6_asbr.c | |
| parent | Merge pull request #43 from pguibert6WIND/frr_6wind_mpbgpgracefulrestart_1 (diff) | |
| parent | Merge pull request #41 from donaldsharp/quagga_to_frr (diff) | |
| download | frr-3b14d86eed3c042db718c7e006ca5299f473c88e.tar.xz frr-3b14d86eed3c042db718c7e006ca5299f473c88e.zip | |
Merge remote-tracking branch 'origin/stable/2.0'
Diffstat (limited to 'ospf6d/ospf6_asbr.c')
| -rw-r--r-- | ospf6d/ospf6_asbr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index d31b4b95b..7d5aca119 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -688,7 +688,7 @@ DEFUN (ospf6_redistribute, ospf6_redistribute_cmd, "redistribute <kernel|connected|static|ripng|isis|bgp|table>", "Redistribute\n" - QUAGGA_REDIST_HELP_STR_OSPF6D) + FRR_REDIST_HELP_STR_OSPF6D) { int type; @@ -705,7 +705,7 @@ DEFUN (ospf6_redistribute_routemap, ospf6_redistribute_routemap_cmd, "redistribute <kernel|connected|static|ripng|isis|bgp|table> route-map WORD", "Redistribute\n" - QUAGGA_REDIST_HELP_STR_OSPF6D + FRR_REDIST_HELP_STR_OSPF6D "Route map reference\n" "Route map name\n") { @@ -728,7 +728,7 @@ DEFUN (no_ospf6_redistribute, "no redistribute <kernel|connected|static|ripng|isis|bgp|table> [route-map WORD]", NO_STR "Redistribute\n" - QUAGGA_REDIST_HELP_STR_OSPF6D + FRR_REDIST_HELP_STR_OSPF6D "Route map reference\n" "Route map name\n") { @@ -744,7 +744,6 @@ DEFUN (no_ospf6_redistribute, return CMD_SUCCESS; } - int ospf6_redistribute_config_write (struct vty *vty) { |