Merge pull request #4695 from donaldsharp/zebra_zapi_msgs
Zebra zapi msgs - improve debugs

lib: use const in ipaddr2str
Use const more

Signed-off-by: Mark Stapp <mjs@voltanet.io>

Merge pull request #4680 from donaldsharp/test_longer
tests: Topotests are not giving sufficient time to propagate data

Merge pull request #4680 from donaldsharp/test_longer
tests: Topotests are not giving sufficient time to propagate data

Merge pull request #4680 from donaldsharp/test_longer
tests: Topotests are not giving sufficient time to propagate data

Merge pull request #4680 from donaldsharp/test_longer
tests: Topotests are not giving sufficient time to propagate data

Merge pull request #4680 from donaldsharp/test_longer
tests: Topotests are not giving sufficient time to propagate data

lib,zebra: avoid use of ctime in monotime api
Replace a call to ctime with ctime_r in the monotime module;
update the callers of the monotime api.

Signed-off-by: Mark Stapp <mjs@voltanet.io>

Merge pull request #4641 from qlyoung/remove-zebra-bs-irdp
zebra: remove bs irdp error code

Merge pull request #4557 from dslicenc/zebra_rnh_eval
zebra: resolve issue with rnh not evaluating nexhops correctly

bgpd: auto router-id should not change configured vpn RD/RT
A router-id change that isn't explicitly configured (a change
from zebra, for example) should not replace a configured vpn
RD/RT.

Signed-off-by: Mark Stapp <mjs@voltanet.io>

Merge pull request #4488 from donaldsharp/pim_solo
Pim solo

Merge pull request #4492 from dslicenc/bgp-l2vpn-parse
bgpd: add l2vpn evpn to afi safi parse utility

lib,bgpd,babeld,ripngd,nhrpd,bfdd: clean up SA warnings
Clean up several SA warnings.

Signed-off-by: Mark Stapp <mjs@voltanet.io>

doc: clean up memleak section of topotests doc
Cleaned up some repetition (cut-and-paste?) in the topotests
developer doc.

Signed-off-by: Mark Stapp <mjs@voltanet.io>

lib, vtysh: make debug memstats work in vtysh
Allow vtysh to send the 'debug memstats-on-exit' command
to the running daemons.

Signed-off-by: Mark Stapp <mjs@voltanet.io>

Merge pull request #4680 from donaldsharp/test_longer
tests: Topotests are not giving sufficient time to propagate data

Merge pull request #4680 from donaldsharp/test_longer
tests: Topotests are not giving sufficient time to propagate data

Merge pull request #4680 from donaldsharp/test_longer
tests: Topotests are not giving sufficient time to propagate data

Merge pull request #4680 from donaldsharp/test_longer
tests: Topotests are not giving sufficient time to propagate data

Merge pull request #4680 from donaldsharp/test_longer
tests: Topotests are not giving sufficient time to propagate data

Merge pull request #4687 from qlyoung/fix-test-ntop-strlen-assert
tests: remove strlen assert in inet_ntop tests

Merge pull request #4653 from qlyoung/fix-pim-helpstringms
pimd: fix some help strings

Merge pull request #4641 from qlyoung/remove-zebra-bs-irdp
zebra: remove bs irdp error code