Merge pull request #7067 from donaldsharp/remove_solaris

author Mark Stapp <mjs@voltanet.io>

Tue, 22 Sep 2020 21:04:19 +0000 (17:04 -0400)

committer GitHub <noreply@github.com>

Tue, 22 Sep 2020 21:04:19 +0000 (17:04 -0400)
author Mark Stapp <mjs@voltanet.io>
Tue, 22 Sep 2020 21:04:19 +0000 (17:04 -0400)
committer GitHub <noreply@github.com>
Tue, 22 Sep 2020 21:04:19 +0000 (17:04 -0400)
diff --cc lib/vty.c
Simple merge
diff --cc zebra/kernel_socket.c
Simple merge
author	Mark Stapp <mjs@voltanet.io>
	Tue, 22 Sep 2020 21:04:19 +0000 (17:04 -0400)
committer	GitHub <noreply@github.com>
	Tue, 22 Sep 2020 21:04:19 +0000 (17:04 -0400)
		1	2
lib/vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/kernel_socket.c	patch \|	diff1 \|	diff2 \|	blob \| history