Merge branch 'stable/2.0'

Conflicts:
	bgpd/rfapi/bgp_rfapi_cfg.c
	bgpd/rfapi/vnc_debug.c

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --cc bgpd/rfapi/bgp_rfapi_cfg.c
index fa62f7051b77514a55cb3280ee2f7ffee802611a,b27febbbebb69d60a6b87f7600a65d312f8f489c..52c5267bf58ec08e59bbfebd6f4d440d53892a78
--- 1/bgpd/rfapi/bgp_rfapi_cfg.c
--- 2/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@@ -1881,9 -1882,9 +1882,9 @@@ DEFUN (vnc_no_export_nvegroup
                                node, nnode, rfgn))
          {
  
 -          if (rfgn->name && !strcmp (rfgn->name, argv[1]))
 +          if (rfgn->name && !strcmp (rfgn->name, argv[6]->arg))
              {
-               zlog_debug ("%s: matched \"%s\"", __func__, rfgn->name);
+               vnc_zlog_debug_verbose ("%s: matched \"%s\"", __func__, rfgn->name);
                if (rfgn->rfg)
                  vnc_direct_bgp_del_group (bgp, rfgn->rfg);
                free (rfgn->name);
@@@ -1900,8 -1901,8 +1901,8 @@@
                                node, nnode, rfgn))
          {
  
-           zlog_debug ("does rfg \"%s\" match?", rfgn->name);
+           vnc_zlog_debug_verbose ("does rfg \"%s\" match?", rfgn->name);
 -          if (rfgn->name && !strcmp (rfgn->name, argv[1]))
 +          if (rfgn->name && !strcmp (rfgn->name, argv[6]->arg))
              {
                if (rfgn->rfg)
                  vnc_zebra_del_group (bgp, rfgn->rfg);

diff --cc bgpd/rfapi/rfapi.c
Simple merge

diff --cc bgpd/rfapi/rfapi_vty.c
Simple merge

diff --cc bgpd/rfapi/vnc_debug.c
index f66be85c253bb575d1f078ded78697f52d2b98dc,4d91f38dcbfa4c6665fbd8937c9237c87c42b34c..bf7a898f58cab0de5bad1bec6cbdc89b56240a9b
--- 1/bgpd/rfapi/vnc_debug.c
--- 2/bgpd/rfapi/vnc_debug.c
+++ b/bgpd/rfapi/vnc_debug.c
@@@ -35,18 -35,19 +35,19 @@@ unsigned long conf_vnc_debug
  unsigned long term_vnc_debug;
  
  struct vnc_debug {
--    unsigned long     bit;
--    const char                *name;
++      unsigned long   bit;
++      const char              *name;
  };
  
  struct vnc_debug      vncdebug[] =
  {
--    {VNC_DEBUG_RFAPI_QUERY,           "rfapi-query"},
--    {VNC_DEBUG_IMPORT_BI_ATTACH,      "import-bi-attach"},
--    {VNC_DEBUG_IMPORT_DEL_REMOTE,     "import-del-remote"},
--    {VNC_DEBUG_EXPORT_BGP_GETCE,      "export-bgp-getce"},
--    {VNC_DEBUG_EXPORT_BGP_DIRECT_ADD, "export-bgp-direct-add"},
--    {VNC_DEBUG_IMPORT_BGP_ADD_ROUTE,  "import-bgp-add-route"},
 -    {VNC_DEBUG_VERBOSE,               "verbose"},
++      {VNC_DEBUG_RFAPI_QUERY,         "rfapi-query"},
++      {VNC_DEBUG_IMPORT_BI_ATTACH,    "import-bi-attach"},
++      {VNC_DEBUG_IMPORT_DEL_REMOTE,   "import-del-remote"},
++      {VNC_DEBUG_EXPORT_BGP_GETCE,    "export-bgp-getce"},
++      {VNC_DEBUG_EXPORT_BGP_DIRECT_ADD,       "export-bgp-direct-add"},
++      {VNC_DEBUG_IMPORT_BGP_ADD_ROUTE,        "import-bgp-add-route"},
++      {VNC_DEBUG_VERBOSE,             "verbose"},
  };
  
  #define VNC_STR "VNC information\n"
@@@ -56,7 -57,7 +57,7 @@@
   ***********************************************************************/
  DEFUN (debug_bgp_vnc,
         debug_bgp_vnc_cmd,
-        "debug bgp vnc <rfapi-query|import-bi-attach|import-del-remote>",
 -       "debug bgp vnc (rfapi-query|import-bi-attach|import-del-remote|verbose)",
++       "debug bgp vnc <rfapi-query|import-bi-attach|import-del-remote|verbose>",
         DEBUG_STR
         BGP_STR
         VNC_STR
@@@ -90,7 -92,7 +92,7 @@@
  
  DEFUN (no_debug_bgp_vnc,
         no_debug_bgp_vnc_cmd,
-        "<no debug|undebug> bgp vnc <rfapi-query|import-bi-attach|import-del-remote>",
 -       "no debug bgp vnc (rfapi-query|import-bi-attach|import-del-remote|verbose)",
++       "<no debug|undebug> bgp vnc <rfapi-query|import-bi-attach|import-del-remote|verbose>",
         NO_STR
         DEBUG_STR
         BGP_STR

diff --cc isisd/isis_circuit.c
Simple merge

diff --cc isisd/isis_te.c
Simple merge

diff --cc ripngd/ripngd.c
Simple merge