Merge pull request #6480 from volta-networks/feat_pwstatus

author Renato Westphal <renato@opensourcerouting.org>

Tue, 2 Jun 2020 00:00:51 +0000 (21:00 -0300)

committer GitHub <noreply@github.com>

Tue, 2 Jun 2020 00:00:51 +0000 (21:00 -0300)
author Renato Westphal <renato@opensourcerouting.org>
Tue, 2 Jun 2020 00:00:51 +0000 (21:00 -0300)
committer GitHub <noreply@github.com>
Tue, 2 Jun 2020 00:00:51 +0000 (21:00 -0300)
diff --cc lib/zclient.h
Simple merge
diff --cc zebra/zebra_dplane.c
Simple merge
diff --cc zebra/zebra_dplane.h
Simple merge
diff --cc zebra/zebra_rib.c
Simple merge
author	Renato Westphal <renato@opensourcerouting.org>
	Tue, 2 Jun 2020 00:00:51 +0000 (21:00 -0300)
committer	GitHub <noreply@github.com>
	Tue, 2 Jun 2020 00:00:51 +0000 (21:00 -0300)
		1	2
lib/zclient.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_dplane.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_dplane.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rib.c	patch \|	diff1 \|	diff2 \|	blob \| history