Merge pull request #2949 from donaldsharp/removal

ospf6d: Remove deprecated code after 1 year
This commit is contained in:
Martin Winter 2018-09-07 19:04:51 +02:00 committed by GitHub
commit cb50f399db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -425,19 +425,6 @@ DEFUN(no_ospf6_router_id,
return CMD_SUCCESS;
}
#if CONFDATE > 20180828
CPP_NOTICE("ospf6: `router-id A.B.C.D` deprecated 2017/08/28")
#endif
ALIAS_HIDDEN(ospf6_router_id, ospf6_router_id_hdn_cmd, "router-id A.B.C.D",
"Configure OSPF6 Router-ID\n" V4NOTATION_STR)
#if CONFDATE > 20180828
CPP_NOTICE("ospf6: `no router-id A.B.C.D` deprecated 2017/08/28")
#endif
ALIAS_HIDDEN(no_ospf6_router_id, no_ospf6_router_id_hdn_cmd,
"no router-id [A.B.C.D]",
NO_STR "Configure OSPF6 Router-ID\n" V4NOTATION_STR)
DEFUN (ospf6_log_adjacency_changes,
ospf6_log_adjacency_changes_cmd,
"log-adjacency-changes",
@ -1144,8 +1131,6 @@ void ospf6_top_init(void)
install_default(OSPF6_NODE);
install_element(OSPF6_NODE, &ospf6_router_id_cmd);
install_element(OSPF6_NODE, &no_ospf6_router_id_cmd);
install_element(OSPF6_NODE, &ospf6_router_id_hdn_cmd);
install_element(OSPF6_NODE, &no_ospf6_router_id_hdn_cmd);
install_element(OSPF6_NODE, &ospf6_log_adjacency_changes_cmd);
install_element(OSPF6_NODE, &ospf6_log_adjacency_changes_detail_cmd);
install_element(OSPF6_NODE, &no_ospf6_log_adjacency_changes_cmd);