Merge branch 'cmaster-next' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
	zebra/interface.c

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc vtysh/extract.pl.in
Simple merge

diff --cc vtysh/vtysh.c
Simple merge

diff --cc zebra/interface.c
index bbe19fbaf4bae7020e83a91ee3b701d242dc99cb,b87f61f920f53751e5c23f0427710c00a785bba0..ff9c0a3019bdb774b1e52a5a7afd0dfa56f455af
--- 1/zebra/interface.c
--- 2/zebra/interface.c
+++ b/zebra/interface.c
@@@ -2965,11 -2993,19 +2977,18 @@@ zebra_if_init (void
    install_element(LINK_PARAMS_NODE, &link_params_inter_as_cmd);
    install_element(LINK_PARAMS_NODE, &no_link_params_inter_as_cmd);
    install_element(LINK_PARAMS_NODE, &link_params_delay_cmd);
 -  install_element(LINK_PARAMS_NODE, &link_params_delay_mm_cmd);
+   install_element(LINK_PARAMS_NODE, &no_link_params_delay_cmd);
    install_element(LINK_PARAMS_NODE, &link_params_delay_var_cmd);
+   install_element(LINK_PARAMS_NODE, &no_link_params_delay_var_cmd);
    install_element(LINK_PARAMS_NODE, &link_params_pkt_loss_cmd);
+   install_element(LINK_PARAMS_NODE, &no_link_params_pkt_loss_cmd);
    install_element(LINK_PARAMS_NODE, &link_params_ava_bw_cmd);
+   install_element(LINK_PARAMS_NODE, &no_link_params_ava_bw_cmd);
    install_element(LINK_PARAMS_NODE, &link_params_res_bw_cmd);
+   install_element(LINK_PARAMS_NODE, &no_link_params_res_bw_cmd);
    install_element(LINK_PARAMS_NODE, &link_params_use_bw_cmd);
+   install_element(LINK_PARAMS_NODE, &no_link_params_use_bw_cmd);
+   install_element(LINK_PARAMS_NODE, &exit_link_params_cmd);
  
    install_element (CONFIG_NODE, &zebra_vrf_cmd);
    install_element (CONFIG_NODE, &no_vrf_cmd);

diff --cc zebra/zebra_rnh_null.c
index b7809d3145937e57d73aeb8c99088c7bac0cacd9,eecb8519d56f0080af88e728eef50dd026233f4c..a5e6b3562d1f7f887858b07be8bdb54571cd88ae
--- 1/zebra/zebra_rnh_null.c
--- 2/zebra/zebra_rnh_null.c
+++ b/zebra/zebra_rnh_null.c
@@@ -1,5 -1,24 +1,25 @@@
+ /* Zebra next hop tracking code
+  * Copyright (C) 2013 Cumulus Networks, Inc.
+  *
+  * This file is part of Quagga.
+  *
+  * Quagga is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU General Public License as published by the
+  * Free Software Foundation; either version 2, or (at your option) any
+  * later version.
+  *
+  * Quagga is distributed in the hope that it will be useful, but
+  * WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with Quagga; see the file COPYING.  If not, write to the Free
+  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+  * 02111-1307, USA.
+  */
  #include <zebra.h>
 +#include "vty.h"
  #include "zebra/rib.h"
  #include "zebra/zserv.h"
  #include "zebra/zebra_rnh.h"