]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #8545 from opensourcerouting/assert-our-own
authorMark Stapp <mjs@voltanet.io>
Mon, 3 May 2021 15:17:36 +0000 (11:17 -0400)
committerGitHub <noreply@github.com>
Mon, 3 May 2021 15:17:36 +0000 (11:17 -0400)
*: make our own assert() actually work

1  2 
bgpd/bgp_io.c
bgpd/bgp_nb_config.c
lib/thread.c
lib/zlog.c
lib/zlog.h
pimd/pim_nb_config.c
pimd/pim_neighbor.c

diff --cc bgpd/bgp_io.c
Simple merge
Simple merge
diff --cc lib/thread.c
Simple merge
diff --cc lib/zlog.c
Simple merge
diff --cc lib/zlog.h
Simple merge
Simple merge
Simple merge