Merge pull request #6231 from dslicenc/v6-ra-hoplimit

author Donatas Abraitis <donatas.abraitis@gmail.com>

Sat, 18 Apr 2020 19:48:20 +0000 (22:48 +0300)

committer GitHub <noreply@github.com>

Sat, 18 Apr 2020 19:48:20 +0000 (22:48 +0300)
author Donatas Abraitis <donatas.abraitis@gmail.com>
Sat, 18 Apr 2020 19:48:20 +0000 (22:48 +0300)
committer GitHub <noreply@github.com>
Sat, 18 Apr 2020 19:48:20 +0000 (22:48 +0300)
diff --cc zebra/interface.c
Simple merge
diff --cc zebra/interface.h
Simple merge
diff --cc zebra/subdir.am
Simple merge
author	Donatas Abraitis <donatas.abraitis@gmail.com>
	Sat, 18 Apr 2020 19:48:20 +0000 (22:48 +0300)
committer	GitHub <noreply@github.com>
	Sat, 18 Apr 2020 19:48:20 +0000 (22:48 +0300)
		1	2
zebra/interface.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/interface.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/subdir.am	patch \|	diff1 \|	diff2 \|	blob \| history