diff options
author | Quentin Young <qlyoung@users.noreply.github.com> | 2017-01-07 01:44:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-07 01:44:46 +0100 |
commit | b84aadae447e1d5e534d2d46e3922f47c316d107 (patch) | |
tree | aba0baabd2a34ec52b5f8a37db92bec576d53e4a /ripd/rip_zebra.c | |
parent | all: use ->text when parsing protocol argument (diff) | |
parent | Merge pull request #32 from qlyoung/fix-cli-nits2 (diff) | |
download | frr-b84aadae447e1d5e534d2d46e3922f47c316d107.tar.xz frr-b84aadae447e1d5e534d2d46e3922f47c316d107.zip |
Merge branch 'master' into fix-proto_redistnum
Diffstat (limited to 'ripd/rip_zebra.c')
-rw-r--r-- | ripd/rip_zebra.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c index 40c25f4c7..043f1c631 100644 --- a/ripd/rip_zebra.c +++ b/ripd/rip_zebra.c @@ -333,7 +333,7 @@ DEFUN (rip_redistribute_type, rip_redistribute_type_cmd, "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table>", REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD) + FRR_REDIST_HELP_STR_RIPD) { int i; @@ -359,7 +359,7 @@ DEFUN (no_rip_redistribute_type, "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table>", NO_STR REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD) + FRR_REDIST_HELP_STR_RIPD) { int i; @@ -385,7 +385,7 @@ DEFUN (rip_redistribute_type_routemap, rip_redistribute_type_routemap_cmd, "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> route-map WORD", REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD + FRR_REDIST_HELP_STR_RIPD "Route map reference\n" "Pointer to route-map entries\n") { @@ -413,7 +413,7 @@ DEFUN (no_rip_redistribute_type_routemap, "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> route-map WORD", NO_STR REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD + FRR_REDIST_HELP_STR_RIPD "Route map reference\n" "Pointer to route-map entries\n") { @@ -440,7 +440,7 @@ DEFUN (rip_redistribute_type_metric, rip_redistribute_type_metric_cmd, "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16)", REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD + FRR_REDIST_HELP_STR_RIPD "Metric\n" "Metric value\n") { @@ -471,7 +471,7 @@ DEFUN (no_rip_redistribute_type_metric, "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16)", NO_STR REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD + FRR_REDIST_HELP_STR_RIPD "Metric\n" "Metric value\n") { @@ -498,7 +498,7 @@ DEFUN (rip_redistribute_type_metric_routemap, rip_redistribute_type_metric_routemap_cmd, "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16) route-map WORD", REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD + FRR_REDIST_HELP_STR_RIPD "Metric\n" "Metric value\n" "Route map reference\n" @@ -534,7 +534,7 @@ DEFUN (no_rip_redistribute_type_metric_routemap, "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16) route-map WORD", NO_STR REDIST_STR - QUAGGA_REDIST_HELP_STR_RIPD + FRR_REDIST_HELP_STR_RIPD "Metric\n" "Metric value\n" "Route map reference\n" |