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

diff --cc zebra/redistribute.c
Simple merge

diff --cc zebra/rib.h
Simple merge

diff --cc zebra/rt_netlink.c
Simple merge

diff --cc zebra/zebra_rib.c
index 36bcfc859f66fb57ed27a75bc21504ed46e1c2f7,d1f679361a1dbf96d849fcae2f257514fd8226e2..e2d7119e03a33bbccdac717fa619da5fff1f3aa6
--- 1/zebra/zebra_rib.c
--- 2/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@@ -2619,12 -2708,23 +2613,23 @@@ static_install_route (afi_t afi, safi_
          zebra_register_rnh_static_nh(&nh_p, rn);
          break;
        case STATIC_IPV6_IFNAME:
 -        nexthop_ifname_add (rib, si->ifname);
 +        rib_nexthop_ifname_add (rib, si->ifname);
          break;
        case STATIC_IPV6_GATEWAY_IFNAME:
 -        nexthop_ipv6_ifname_add (rib, &si->addr.ipv6, si->ifname);
 +        rib_nexthop_ipv6_ifname_add (rib, &si->addr.ipv6, si->ifname);
          break;
          }
+ 
+       if (IS_ZEBRA_DEBUG_RIB)
+         {
+           char buf[INET6_ADDRSTRLEN];
+           if (IS_ZEBRA_DEBUG_RIB)
+             {
+               inet_ntop (p->family, &p->u.prefix, buf, INET6_ADDRSTRLEN);
+               zlog_debug ("%u:%s/%d: Modifying route rn %p, rib %p (type %d)",
+                           si->vrf_id, buf, p->prefixlen, rn, rib, rib->type);
+             }
+         }
        rib_queue_add (&zebrad, rn);
      }
    else

diff --cc zebra/zserv.c
Simple merge