diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-12-06 19:51:33 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-12-06 19:51:33 +0000 |
| commit | 6fd800be4ac4da8ec034f2a858e0183b8ae9bb01 (patch) | |
| tree | e1a77a68567f6496415b6476a6bed52c77d64619 /ospf6d/ospf6_top.c | |
| parent | 3d6e734154e6da17423e9054b5443774cacfdd51 (diff) | |
| parent | 9dec6b446c5487623ad04fdaa8160e3338f12799 (diff) | |
Merge remote-tracking branch 'osr/master' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
lib/command_match.c
Diffstat (limited to 'ospf6d/ospf6_top.c')
| -rw-r--r-- | ospf6d/ospf6_top.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index a63d73f438..16fb012ea9 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -623,6 +623,7 @@ DEFUN (no_ospf6_distance_ospf6, return CMD_SUCCESS; } +#if 0 DEFUN (ospf6_distance_source, ospf6_distance_source_cmd, "distance (1-255) X:X::X:X/M [WORD]", @@ -653,6 +654,7 @@ DEFUN (no_ospf6_distance_source, return CMD_SUCCESS; } +#endif DEFUN (ospf6_interface_area, ospf6_interface_area_cmd, @@ -834,6 +836,7 @@ DEFUN (no_ospf6_stub_router_admin, return CMD_SUCCESS; } +#if 0 DEFUN (ospf6_stub_router_startup, ospf6_stub_router_startup_cmd, "stub-router on-startup (5-86400)", @@ -879,6 +882,7 @@ DEFUN (no_ospf6_stub_router_shutdown, { return CMD_SUCCESS; } +#endif static void ospf6_show (struct vty *vty, struct ospf6 *o) |