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

Merge branch 'cmaster-next' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	zebra/interface.c
---

3bd20d8460a0b086013cafd89172a8c633714af8
diff --cc zebra/interface.c
index bbe19fbaf4,b87f61f920..ff9c0a3019
--- a/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, &no_link_params_delay_cmd);
 -  install_element(LINK_PARAMS_NODE, &link_params_delay_mm_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 b7809d3145,eecb8519d5..a5e6b3562d
--- a/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"