Merge pull request #6706 from donaldsharp/router_id_bullshit

author Renato Westphal <renato@opensourcerouting.org>

Thu, 16 Jul 2020 21:09:38 +0000 (18:09 -0300)

committer GitHub <noreply@github.com>

Thu, 16 Jul 2020 21:09:38 +0000 (18:09 -0300)
author Renato Westphal <renato@opensourcerouting.org>
Thu, 16 Jul 2020 21:09:38 +0000 (18:09 -0300)
committer GitHub <noreply@github.com>
Thu, 16 Jul 2020 21:09:38 +0000 (18:09 -0300)
diff --cc zebra/main.c
Simple merge
diff --cc zebra/zapi_msg.c
Simple merge
diff --cc zebra/zebra_vty.c
Simple merge
author	Renato Westphal <renato@opensourcerouting.org>
	Thu, 16 Jul 2020 21:09:38 +0000 (18:09 -0300)
committer	GitHub <noreply@github.com>
	Thu, 16 Jul 2020 21:09:38 +0000 (18:09 -0300)
		1	2
zebra/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zapi_msg.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history