Merge branch 'stable/3.0'

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

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc ospf6d/ospf6_area.c
Simple merge

diff --cc ospfd/ospf_vty.c
Simple merge

diff --cc pimd/pim_ifchannel.c
Simple merge

diff --cc pimd/pim_ifchannel.h
Simple merge

diff --cc pimd/pim_join.c
index 5462dba61df17384ef4f191387dfe363682568d1,2da0b993534f7e52e3d42136343c3b2088e1366d..35deecfd81221a3f1bd369d70c42e5d10330460c
--- 1/pimd/pim_join.c
--- 2/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@@ -515,9 -521,10 +534,13 @@@ int pim_joinprune_send(struct pim_rpf *
        packet_size += group_size;
        pim_msg_build_jp_groups (grp, group, group_size);
  
 +      pim_ifp->pim_ifstat_join_send += ntohs(grp->joins);
 +      pim_ifp->pim_ifstat_prune_send += ntohs(grp->prunes);
 +
+       if (PIM_DEBUG_PIM_TRACE)
+         zlog_debug ("%s: interface %s num_joins %u num_prunes %u", __PRETTY_FUNCTION__,
+           rpf->source_nexthop.interface->name, ntohs(grp->joins), ntohs (grp->prunes));
+ 
        grp = (struct pim_jp_groups *)curr_ptr;
        if (packet_left < sizeof (struct pim_jp_groups) || msg->num_groups == 255)
          {

diff --cc pimd/pim_rpf.c
Simple merge

diff --cc pimd/pim_upstream.c
Simple merge

diff --cc vtysh/vtysh.c
Simple merge