Merge pull request #2705 from opensourcerouting/northbound-yang-v2

author Donald Sharp <sharpd@cumulusnetworks.com>

Wed, 31 Oct 2018 22:50:45 +0000 (18:50 -0400)

committer GitHub <noreply@github.com>

Wed, 31 Oct 2018 22:50:45 +0000 (18:50 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Wed, 31 Oct 2018 22:50:45 +0000 (18:50 -0400)
committer GitHub <noreply@github.com>
Wed, 31 Oct 2018 22:50:45 +0000 (18:50 -0400)
diff --cc configure.ac
Simple merge
diff --cc redhat/frr.spec.in
Simple merge
diff --cc zebra/kernel_socket.c
Simple merge
diff --cc zebra/main.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 31 Oct 2018 22:50:45 +0000 (18:50 -0400)
committer	GitHub <noreply@github.com>
	Wed, 31 Oct 2018 22:50:45 +0000 (18:50 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
redhat/frr.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/kernel_socket.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/main.c	patch \|	diff1 \|	diff2 \|	blob \| history