Merge pull request #7222 from idryzhov/fix-debug

author Renato Westphal <renato@opensourcerouting.org>

Sat, 10 Oct 2020 00:58:24 +0000 (21:58 -0300)

committer GitHub <noreply@github.com>

Sat, 10 Oct 2020 00:58:24 +0000 (21:58 -0300)
author Renato Westphal <renato@opensourcerouting.org>
Sat, 10 Oct 2020 00:58:24 +0000 (21:58 -0300)
committer GitHub <noreply@github.com>
Sat, 10 Oct 2020 00:58:24 +0000 (21:58 -0300)
diff --cc ospf6d/ospf6d.c
Simple merge
diff --cc pimd/pim_cmd.c
Simple merge
diff --cc staticd/static_vty.c
Simple merge
diff --cc vtysh/vtysh.c
Simple merge
author	Renato Westphal <renato@opensourcerouting.org>
	Sat, 10 Oct 2020 00:58:24 +0000 (21:58 -0300)
committer	GitHub <noreply@github.com>
	Sat, 10 Oct 2020 00:58:24 +0000 (21:58 -0300)
		1	2
ospf6d/ospf6d.c	patch \|	diff1 \|	diff2 \|	blob \| history
pimd/pim_cmd.c	patch \|	diff1 \|	diff2 \|	blob \| history
staticd/static_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
vtysh/vtysh.c	patch \|	diff1 \|	diff2 \|	blob \| history