From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Thu, 3 Nov 2016 20:43:41 +0000 (+0000)
Subject: Merge branch 'cmaster-next' into vtysh-grammar
X-Git-Tag: frr-3.0-branchpoint~129^2~53
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=476e95e3f365962f5d74d09774b777477d2f539a;p=mirror%2Ffrr.git

Merge branch 'cmaster-next' into vtysh-grammar
---

476e95e3f365962f5d74d09774b777477d2f539a
diff --cc ospfd/ospf_ri.c
index 87d8f596f9,65659709b2..30d203f5b5
--- a/ospfd/ospf_ri.c
+++ b/ospfd/ospf_ri.c
@@@ -1650,9 -1652,12 +1652,11 @@@ ospf_router_info_register_vty (void
    install_element (VIEW_NODE, &show_ip_ospf_router_info_pce_cmd);
  
    install_element (OSPF_NODE, &router_info_area_cmd);
 -  install_element (OSPF_NODE, &router_info_as_cmd);
    install_element (OSPF_NODE, &no_router_info_cmd);
    install_element (OSPF_NODE, &pce_address_cmd);
+   install_element (OSPF_NODE, &no_pce_address_cmd);
    install_element (OSPF_NODE, &pce_path_scope_cmd);
+   install_element (OSPF_NODE, &no_pce_path_scope_cmd);
    install_element (OSPF_NODE, &pce_domain_cmd);
    install_element (OSPF_NODE, &no_pce_domain_cmd);
    install_element (OSPF_NODE, &pce_neighbor_cmd);