From: vivek <vivek@cumulusnetworks.com>
Date: Fri, 20 Nov 2015 16:51:48 +0000 (-0800)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1191
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=922705ecdccad98dcb5eb8dcb37394ec339afe51;p=mirror%2Ffrr.git

Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
---

922705ecdccad98dcb5eb8dcb37394ec339afe51
diff --cc zebra/connected.c
index 98e0bb84af,b9ab3e13b5..41b68d1564
--- a/zebra/connected.c
+++ b/zebra/connected.c
@@@ -392,11 -348,9 +348,9 @@@ connected_delete_ipv4 (struct interfac
    if (! ifc)
      return;
  
-   connected_delete_ipv4_unnumbered (ifc);
- 
    connected_withdraw (ifc);
  
 -  if (IS_ZEBRA_DEBUG_RIB)
 +  if (IS_ZEBRA_DEBUG_RIB_DETAILED)
      zlog_debug ("%s: calling rib_update_static", __func__);
  
    rib_update_static(ifp->vrf_id);